From lattner at cs.uiuc.edu  Mon Aug 11 09:57:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 09:57:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/SelectionDAG.h
Message-ID: <200308111456.JAA04440@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

SelectionDAG.h added (r1.1)

---
Log message:

Initial checkin of SelectionDAG header file


---
Diffs of the changes:

Index: llvm/include/llvm/CodeGen/SelectionDAG.h
diff -c /dev/null llvm/include/llvm/CodeGen/SelectionDAG.h:1.1
*** /dev/null	Mon Aug 11 09:56:36 2003
--- llvm/include/llvm/CodeGen/SelectionDAG.h	Mon Aug 11 09:56:26 2003
***************
*** 0 ****
--- 1,334 ----
+ //===-- llvm/CodeGen/SelectionDAG.h - InstSelection DAG Rep. ----*- C++ -*-===//
+ // 
+ // This file declares the SelectionDAG class, which is used to represent an LLVM
+ // function in a low-level representation suitable for instruction selection.
+ // This DAG is constructed as the first step of instruction selection in order
+ // to allow implementation of machine specific optimizations and code
+ // simplifications.
+ //
+ // The representation used by the SelectionDAG is a target-independent
+ // representation, which is loosly modeled after the GCC RTL representation, but
+ // is significantly simpler.
+ //   
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef LLVM_CODEGEN_SELECTIONDAG_H
+ #define LLVM_CODEGEN_SELECTIONDAG_H
+ 
+ #include "llvm/CodeGen/ValueTypes.h"
+ #include "Support/DataTypes.h"
+ #include <map>
+ #include <vector>
+ class Value;
+ class Type;
+ class Instruction;
+ class BasicBlock;
+ class MachineBasicBlock;
+ class MachineFunction;
+ class TargetMachine;
+ class SelectionDAGNode;
+ class SelectionDAGBlock;
+ class SelectionDAGBuilder;
+ class SelectionDAGTargetBuilder;
+ 
+ /// ISD namespace - This namespace contains an enum which represents all of the
+ /// SelectionDAG node types and value types.
+ ///
+ namespace ISD {
+   enum NodeType {
+     // ChainNode nodes are used to sequence operations within a basic block
+     // which cannot be reordered (such as loads, stores, calls, etc).
+     // BlockChainNodes are used to connect the DAG's for different basic blocks
+     // into one big DAG.
+     ChainNode, BlockChainNode,
+ 
+     // ProtoNodes are nodes that are only half way constructed.
+     ProtoNode,
+ 
+     // Leaf nodes.
+     Constant, FrameIndex,
+ 
+     // Simple binary arithmetic operators
+     Plus, Minus, Times, SDiv, UDiv, SRem, URem,
+ 
+     // Bitwise operators
+     And, Or, Xor,
+ 
+     // Control flow instructions
+     Br, Switch, Ret, RetVoid,
+ 
+     // Other operators
+     Load, Store, PHI, Call,
+   };
+ }
+ 
+ class SelectionDAG {
+   friend class SelectionDAGBuilder;
+   MachineFunction &F;
+   const TargetMachine &TM;
+   MVT::ValueType PointerType;    // The ValueType the target uses for pointers
+ 
+   // ValueMap - The SelectionDAGNode for each LLVM value in the function.
+   std::map<const Value*, SelectionDAGNode*> ValueMap;
+ 
+   // BlockMap - The MachineBasicBlock created for each LLVM BasicBlock
+   std::map<const BasicBlock*, MachineBasicBlock*> BlockMap;
+ 
+   // Root - The root of the entire DAG
+   SelectionDAGNode *Root;
+ 
+   // AllNodes - All of the nodes in the DAG
+   std::vector<SelectionDAGNode*> AllNodes;
+ public:
+   /// SelectionDAG constructor - Build a SelectionDAG for the specified
+   /// function.  Implemented in DAGBuilder.cpp
+   ///
+   SelectionDAG(MachineFunction &F, const TargetMachine &TM,
+                SelectionDAGTargetBuilder &SDTB);
+   ~SelectionDAG();
+ 
+   /// getValueType - Return the ValueType for the specified LLVM type.  This
+   /// method works on all scalar LLVM types.
+   ///
+   MVT::ValueType getValueType(const Type *Ty) const;
+ 
+   /// getRoot - Return the root of the current SelectionDAG.
+   ///
+   SelectionDAGNode *getRoot() const { return Root; }
+ 
+   /// getMachineFunction - Return the MachineFunction object that this
+   /// SelectionDAG corresponds to.
+   ///
+   MachineFunction &getMachineFunction() const { return F; }
+ 
+   //===--------------------------------------------------------------------===//
+   // Addition and updating methods
+   //
+ 
+   /// addNode - Add the specified node to the SelectionDAG so that it will be
+   /// deleted when the DAG is...
+   ///
+   SelectionDAGNode *addNode(SelectionDAGNode *N) {
+     AllNodes.push_back(N);
+     return N;
+   }
+ 
+   /// addNodeForValue - Add the specified node to the SelectionDAG so that it
+   /// will be deleted when the DAG is... and update the value map to indicate
+   /// that the specified DAG node computes the value.  Note that it is an error
+   /// to specify multiple DAG nodes that compute the same value.
+   ///
+   SelectionDAGNode *addNodeForValue(SelectionDAGNode *N, const Value *V) {
+     assert(ValueMap.count(V) == 0 && "Value already has a DAG node!");
+     return addNode(ValueMap[V] = N);
+   }
+ 
+   void dump() const;
+ private:
+   void addInstructionToDAG(const Instruction &I, const BasicBlock &BB);
+ };
+ 
+ 
+ /// SelectionDAGReducedValue - During the reducer pass we need the ability to
+ /// add an arbitrary (but usually 1 or 0) number of arbitrarily sized values to
+ /// the selection DAG.  Because of this, we represent these values as a singly
+ /// linked list of values attached to the DAGNode.  We end up putting the
+ /// arbitrary state for the value in subclasses of this node.
+ ///
+ /// Note that this class does not have a virtual dtor, this is because we know
+ /// that the subclasses will not hold state that needs to be destroyed.
+ ///
+ class SelectionDAGReducedValue {
+   unsigned Code;
+   SelectionDAGReducedValue *Next;
+ public:
+   SelectionDAGReducedValue(unsigned C) : Code(C), Next(0) {}
+ 
+   /// getValueCode - Return the code for this reducer value...
+   ///
+   unsigned getValueCode() const { return Code; }
+   
+   /// getNext - Return the next value in the list
+   ///
+   const SelectionDAGReducedValue *getNext() const { return Next; }
+   void setNext(SelectionDAGReducedValue *N) { Next = N; }
+ 
+   SelectionDAGReducedValue *getNext() { return Next; }
+ };
+ 
+ 
+ 
+ /// SelectionDAGNode - Represents one node in the selection DAG.
+ ///
+ class SelectionDAGNode {
+   std::vector<SelectionDAGNode*> Uses;
+   ISD::NodeType  NodeType;
+   MVT::ValueType ValueType;
+   MachineBasicBlock *BB;
+   SelectionDAGReducedValue *ValList;
+ 
+   /// Costs - Each pair of elements of 'Costs' contains the cost of producing
+   /// the value with the target specific slot number and the production number
+   /// to use to produce it.  A zero value for the production number indicates
+   /// that the cost has not yet been computed.
+   unsigned *Costs;
+ public:
+   SelectionDAGNode(ISD::NodeType NT, MVT::ValueType VT,
+                    MachineBasicBlock *bb = 0) 
+     : NodeType(NT), ValueType(VT), BB(bb), ValList(0), Costs(0) {}
+ 
+   SelectionDAGNode(ISD::NodeType NT, MVT::ValueType VT, MachineBasicBlock *bb,
+                    SelectionDAGNode *N)
+     : NodeType(NT), ValueType(VT), BB(bb), ValList(0), Costs(0) {
+     assert(NT != ISD::ProtoNode && "Cannot specify uses for a protonode!");
+     Uses.reserve(1); Uses.push_back(N);
+   }
+   SelectionDAGNode(ISD::NodeType NT, MVT::ValueType VT, MachineBasicBlock *bb,
+                    SelectionDAGNode *N1, SelectionDAGNode *N2)
+     : NodeType(NT), ValueType(VT), BB(bb), ValList(0), Costs(0) {
+     assert(NT != ISD::ProtoNode && "Cannot specify uses for a protonode!");
+     Uses.reserve(2); Uses.push_back(N1); Uses.push_back(N2);
+   }
+ 
+   ~SelectionDAGNode() { delete [] Costs; delete ValList; }
+ 
+   void setNode(ISD::NodeType NT, MachineBasicBlock *bb) {
+     assert(NodeType == ISD::ProtoNode && NT != ISD::ProtoNode);
+     NodeType = NT; BB = bb;
+   }
+   void setNode(ISD::NodeType NT, MachineBasicBlock *bb, SelectionDAGNode *N) {
+     assert(NodeType == ISD::ProtoNode && NT != ISD::ProtoNode);
+     NodeType = NT; BB = bb; Uses.reserve(1); Uses.push_back(N);
+   }
+   void setNode(ISD::NodeType NT, MachineBasicBlock *bb, 
+                SelectionDAGNode *N1, SelectionDAGNode *N2) {
+     assert(NodeType == ISD::ProtoNode && NT != ISD::ProtoNode);
+     NodeType = NT; BB = bb;
+     Uses.reserve(1); Uses.push_back(N1); Uses.push_back(N2);
+   }
+ 
+   //===--------------------------------------------------------------------===//
+   //  Accessors
+   //
+   ISD::NodeType  getNodeType()  const { return NodeType; }
+   MVT::ValueType getValueType() const { return ValueType; }
+   MachineBasicBlock *getBB() const { return BB; }
+ 
+   SelectionDAGNode *getUse(unsigned Num) {
+     assert(Num < Uses.size() && "Invalid child # of SelectionDAGNode!");
+     return Uses[Num];
+   }
+ 
+   template<class Type>
+   Type *getValue(unsigned Code) const {
+     SelectionDAGReducedValue *Vals = ValList;
+     while (1) {
+       assert(Vals && "Code does not exist in this list!");
+       if (Vals->getValueCode() == Code)
+         return (Type*)Vals;
+       Vals = Vals->getNext();
+     }
+   }
+ 
+   template<class Type>
+   Type *hasValue(unsigned Code) const {
+     SelectionDAGReducedValue *Vals = ValList;
+     while (Vals) {
+       if (Vals->getValueCode() == Code)
+         return (Type*)Vals;
+       Vals = Vals->getNext();
+     }
+     return false;
+   }
+ 
+   void addValue(SelectionDAGReducedValue *New) {
+     assert(New->getNext() == 0);
+     New->setNext(ValList);
+     ValList = New;
+   }
+ 
+   //===--------------------------------------------------------------------===//
+   // Utility methods used by the pattern matching instruction selector
+   //
+ 
+   /// getPatternFor - Return the pattern selected to compute the specified slot,
+   /// or zero if there is no pattern yet.
+   ///
+   unsigned getPatternFor(unsigned Slot) const {
+     return Costs ? Costs[Slot*2] : 0;
+   }
+ 
+   /// getCostFor - Return the cost to compute the value corresponding to Slot.
+   ///
+   unsigned getCostFor(unsigned Slot) const {
+     return Costs ? Costs[Slot*2+1] : 0;
+   }
+ 
+   /// setPatternCostFor - Sets the pattern and the cost for the specified slot
+   /// to the specified values.  This allocates the Costs vector if necessary, so
+   /// you must specify the maximum number of slots that may be used.
+   ///
+   void setPatternCostFor(unsigned Slot, unsigned Pattern, unsigned Cost,
+                          unsigned NumSlots) {
+     if (Costs == 0) {
+       Costs = new unsigned[NumSlots*2];
+       for (unsigned i = 0; i != NumSlots*2; ++i) Costs[i] = 0;
+     }
+     Costs[Slot*2] = Pattern;
+     Costs[Slot*2+1] = Cost;
+   }
+ 
+   void dump() const;
+ private:
+   void printit(unsigned Offset, unsigned &LastID,
+                std::map<const SelectionDAGNode*, unsigned> &NodeIDs) const;
+ };
+ 
+ 
+ /// SelectionDAGTargetBuilder - This class must be implemented by the target, to
+ /// indicate how to perform the extremely target-specific tasks of building DAG
+ /// nodes to represent the calling convention used by the target.
+ ///
+ struct SelectionDAGTargetBuilder {
+   /// expandArguments - This method is called once by the SelectionDAG
+   /// construction mechanisms to add DAG nodes for each formal argument to the
+   /// current function.  If any of the incoming arguments lives on the stack,
+   /// this method should also create the stack slots for the arguments as
+   /// necessary.
+   virtual void expandArguments(SelectionDAG &SD, MachineFunction &MF) = 0;
+ };
+ 
+ namespace ISD {
+   enum {   // Builtin Slot numbers
+     Constant_i1_Slot,
+     Constant_i8_Slot,
+     Constant_i16_Slot,
+     Constant_i32_Slot,
+     Constant_i64_Slot,
+     Constant_f32_Slot,
+     Constant_f64_Slot,
+ 
+     FrameIndex_i32_Slot,
+     FrameIndex_i64_Slot,
+     NumBuiltinSlots
+   };
+ }
+ 
+ template<typename ValType, unsigned NodeCode>
+ struct ReducedValue : public SelectionDAGReducedValue {
+   ReducedValue(const ValType &V) : SelectionDAGReducedValue(NodeCode), Val(V) {}
+   ValType Val;
+ };
+ 
+ typedef ReducedValue<int, ISD::FrameIndex_i32_Slot > ReducedValue_FrameIndex_i32;
+ typedef ReducedValue<int, ISD::FrameIndex_i64_Slot > ReducedValue_FrameIndex_i64;
+ 
+ typedef ReducedValue<bool          , ISD::Constant_i1_Slot > ReducedValue_Constant_i1;
+ typedef ReducedValue<unsigned char , ISD::Constant_i8_Slot > ReducedValue_Constant_i8;
+ typedef ReducedValue<unsigned short, ISD::Constant_i16_Slot> ReducedValue_Constant_i16;
+ typedef ReducedValue<unsigned      , ISD::Constant_i32_Slot> ReducedValue_Constant_i32;
+ typedef ReducedValue<uint64_t      , ISD::Constant_i64_Slot> ReducedValue_Constant_i64;
+ typedef ReducedValue<float         , ISD::Constant_f32_Slot> ReducedValue_Constant_f32;
+ typedef ReducedValue<double        , ISD::Constant_f64_Slot> ReducedValue_Constant_f64;
+ 
+ #endif




From lattner at cs.uiuc.edu  Mon Aug 11 09:57:07 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 09:57:07 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Selection/
Message-ID: <200308111456.JAA04414@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/Selection:


---
Log message:

Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/lib/CodeGen/Selection added to the repository


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Mon Aug 11 09:58:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 09:58:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Makefile
Message-ID: <200308111457.JAA04517@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

Makefile updated: 1.10 -> 1.11

---
Log message:

Build the SelectionDAG library


---
Diffs of the changes:

Index: llvm/lib/CodeGen/Makefile
diff -u llvm/lib/CodeGen/Makefile:1.10 llvm/lib/CodeGen/Makefile:1.11
--- llvm/lib/CodeGen/Makefile:1.10	Fri Oct 25 17:54:41 2002
+++ llvm/lib/CodeGen/Makefile	Mon Aug 11 09:57:48 2003
@@ -1,5 +1,5 @@
 LEVEL = ../..
-PARALLEL_DIRS = PreOpts InstrSelection InstrSched RegAlloc PostOpts Mapping
+PARALLEL_DIRS = PreOpts InstrSelection InstrSched RegAlloc PostOpts Mapping Selection
 LIBRARYNAME = codegen
 
 include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Mon Aug 11 09:58:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 09:58:02 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Selection/DAGBuilder.cpp Makefile SelectionDAG.cpp
Message-ID: <200308111457.JAA04496@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/Selection:

DAGBuilder.cpp added (r1.1)
Makefile added (r1.1)
SelectionDAG.cpp added (r1.1)

---
Log message:

Initial checkin of SelectionDAG implementation.  This is still rough and
unfinished


---
Diffs of the changes:

Index: llvm/lib/CodeGen/Selection/DAGBuilder.cpp
diff -c /dev/null llvm/lib/CodeGen/Selection/DAGBuilder.cpp:1.1
*** /dev/null	Mon Aug 11 09:57:43 2003
--- llvm/lib/CodeGen/Selection/DAGBuilder.cpp	Mon Aug 11 09:57:33 2003
***************
*** 0 ****
--- 1,222 ----
+ //===-- DAGBuilder.cpp - Turn an LLVM BasicBlock into a DAG for selection -===//
+ //
+ // This file turns an LLVM BasicBlock into a target independent SelectionDAG in
+ // preparation for target specific optimizations and instruction selection.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "llvm/CodeGen/SelectionDAG.h"
+ #include "llvm/Function.h"
+ #include "llvm/Instructions.h"
+ #include "llvm/Support/InstVisitor.h"
+ #include "llvm/CodeGen/MachineFunction.h"
+ #include "llvm/Target/TargetMachine.h"
+ #include "llvm/Type.h"
+ #include "llvm/Constants.h"
+ 
+ struct SelectionDAGBuilder : public InstVisitor<SelectionDAGBuilder> {
+   // DAG - the current dag we are building.
+   SelectionDAG &DAG;
+ 
+   // BB - The current machine basic block we are working on.
+   MachineBasicBlock *BB;
+ 
+   // CurRoot - The root built for the current basic block.
+   SelectionDAGNode *CurRoot;
+ 
+   SelectionDAGBuilder(SelectionDAG &dag) : DAG(dag), BB(0), CurRoot(0) {}
+ 
+   void visitBB(BasicBlock &bb);
+ 
+   // Visitation methods for instructions: Create the appropriate DAG nodes for
+   // the instruction.
+   void visitAdd(BinaryOperator &BO);
+   void visitSub(BinaryOperator &BO);
+   void visitMul(BinaryOperator &BO);
+   void visitRet(ReturnInst &RI);
+ 
+   void visitAnd(BinaryOperator &BO);
+   void visitOr (BinaryOperator &BO);
+   void visitXor(BinaryOperator &BO);
+ 
+   void visitInstruction(Instruction &I) {
+     std::cerr << "Instruction Selection cannot select: " << I;
+     abort();
+   }
+ 
+ private:
+   SelectionDAGNode *getNodeFor(Value *V);
+   SelectionDAGNode *getNodeFor(Value &V) { return getNodeFor(&V); }
+   
+   SelectionDAGNode *addSeqNode(SelectionDAGNode *N);
+ };
+ 
+ /// addSeqNode - The same as addNode, but the node is also included in the
+ /// sequence nodes for this block.  This method should be called for any
+ /// instructions which have a specified sequence they must be evaluated in.
+ ///
+ SelectionDAGNode *SelectionDAGBuilder::addSeqNode(SelectionDAGNode *N) {
+   DAG.addNode(N);   // First, add the node to the selection DAG
+   
+   if (!CurRoot)
+     CurRoot = N;
+   else {
+     // Create and add a new chain node for the existing root and this node...
+     CurRoot = DAG.addNode(new SelectionDAGNode(ISD::ChainNode, MVT::isVoid,
+                                                BB, CurRoot, N));
+   }
+   return N;
+ }
+ 
+ /// getNodeFor - This method returns the SelectionDAGNode for the specified LLVM
+ /// value, creating a node as necessary.
+ ///
+ SelectionDAGNode *SelectionDAGBuilder::getNodeFor(Value *V) {
+   // If we already have the entry, return it.
+   SelectionDAGNode*& Entry = DAG.ValueMap[V];
+   if (Entry) return Entry;
+   
+   // Otherwise, we need to create a node to return now... start by figuring out
+   // which type the node will be...
+   MVT::ValueType ValueType = DAG.getValueType(V->getType());
+ 
+   if (Instruction *I = dyn_cast<Instruction>(V))
+     // Instructions will be filled in later.  For now, just create and return a
+     // dummy node.
+     return Entry = new SelectionDAGNode(ISD::ProtoNode, ValueType);
+ 
+   if (Constant *C = dyn_cast<Constant>(V)) {
+     if (ConstantBool *CB = dyn_cast<ConstantBool>(C)) {
+       Entry = new SelectionDAGNode(ISD::Constant, ValueType);
+       Entry->addValue(new ReducedValue_Constant_i1(CB->getValue()));
+     } else if (ConstantInt *CI = dyn_cast<ConstantInt>(C)) {
+       Entry = new SelectionDAGNode(ISD::Constant, ValueType);
+       switch (ValueType) {
+       case MVT::i8:
+         Entry->addValue(new ReducedValue_Constant_i8(CI->getRawValue()));
+         break;
+       case MVT::i16:
+         Entry->addValue(new ReducedValue_Constant_i16(CI->getRawValue()));
+         break;
+       case MVT::i32:
+         Entry->addValue(new ReducedValue_Constant_i32(CI->getRawValue()));
+         break;
+       case MVT::i64:
+         Entry->addValue(new ReducedValue_Constant_i64(CI->getRawValue()));
+         break;
+       default:
+         assert(0 && "Invalid ValueType for an integer constant!");
+       }
+ 
+     } else if (ConstantFP *CFP = dyn_cast<ConstantFP>(C)) {
+       Entry = new SelectionDAGNode(ISD::Constant, ValueType);
+       if (ValueType == MVT::f32)
+         Entry->addValue(new ReducedValue_Constant_f32(CFP->getValue()));
+       else
+         Entry->addValue(new ReducedValue_Constant_f64(CFP->getValue()));
+     }
+     if (Entry) return Entry;
+   }
+ 
+   std::cerr << "Unhandled LLVM value in DAG Builder!: " << *V << "\n";
+   abort();
+   return 0;
+ }
+ 
+ 
+ // visitBB - This method is used to visit a basic block in the program.  It
+ // manages the CurRoot instance variable so that all of the visit(Instruction)
+ // methods can be written to assume that there is only one basic block being
+ // constructed.
+ //
+ void SelectionDAGBuilder::visitBB(BasicBlock &bb) {
+   BB = DAG.BlockMap[&bb];       // Update BB instance var
+   
+   // Save the current global DAG...
+   SelectionDAGNode *OldRoot = CurRoot;
+   CurRoot = 0;
+   
+   visit(bb.begin(), bb.end());  // Visit all of the instructions...
+   
+   if (OldRoot) {
+     if (!CurRoot)
+       CurRoot = OldRoot;   // This block had no root of its own..
+     else {
+       // The previous basic block AND this basic block had roots, insert a
+       // block chain node now...
+         CurRoot = DAG.addNode(new SelectionDAGNode(ISD::BlockChainNode,
+                                                    MVT::isVoid,
+                                                    BB, OldRoot, CurRoot));
+     }
+   }
+ }
+ 
+ //===----------------------------------------------------------------------===//
+ //                         ...Visitation Methods...
+ //===----------------------------------------------------------------------===//
+ 
+ void SelectionDAGBuilder::visitAdd(BinaryOperator &BO) {
+   getNodeFor(BO)->setNode(ISD::Plus, BB, getNodeFor(BO.getOperand(0)),
+                           getNodeFor(BO.getOperand(1)));
+ }
+ void SelectionDAGBuilder::visitSub(BinaryOperator &BO) {
+   getNodeFor(BO)->setNode(ISD::Minus, BB, getNodeFor(BO.getOperand(0)),
+                           getNodeFor(BO.getOperand(1)));
+ }
+ void SelectionDAGBuilder::visitMul(BinaryOperator &BO) {
+   getNodeFor(BO)->setNode(ISD::Times, BB, getNodeFor(BO.getOperand(0)),
+                           getNodeFor(BO.getOperand(1)));
+ }
+ 
+ void SelectionDAGBuilder::visitAnd(BinaryOperator &BO) {
+   getNodeFor(BO)->setNode(ISD::And, BB, getNodeFor(BO.getOperand(0)),
+                           getNodeFor(BO.getOperand(1)));
+ }
+ void SelectionDAGBuilder::visitOr(BinaryOperator &BO) {
+   getNodeFor(BO)->setNode(ISD::Or, BB, getNodeFor(BO.getOperand(0)),
+                           getNodeFor(BO.getOperand(1)));
+ }
+ void SelectionDAGBuilder::visitXor(BinaryOperator &BO) {
+   getNodeFor(BO)->setNode(ISD::Xor, BB, getNodeFor(BO.getOperand(0)),
+                           getNodeFor(BO.getOperand(1)));
+ }
+ 
+ void SelectionDAGBuilder::visitRet(ReturnInst &RI) {
+   if (RI.getNumOperands()) {         // Value return
+     addSeqNode(new SelectionDAGNode(ISD::Ret, MVT::isVoid, BB,
+                                     getNodeFor(RI.getOperand(0))));
+   } else {                           // Void return
+     addSeqNode(new SelectionDAGNode(ISD::RetVoid, MVT::isVoid, BB));
+   }
+ }
+ 
+ 
+ 
+ 
+ // SelectionDAG constructor - Just use the SeelectionDAGBuilder to do all of the
+ // dirty work...
+ SelectionDAG::SelectionDAG(MachineFunction &f, const TargetMachine &tm,
+                            SelectionDAGTargetBuilder &SDTB)
+   : F(f), TM(tm) {
+ 
+   switch (TM.getTargetData().getPointerSize()) {
+   default: assert(0 && "Unknown pointer size!"); abort();
+   case 8:  PointerType = MVT::i8; break;
+   case 16: PointerType = MVT::i16; break;
+   case 32: PointerType = MVT::i32; break;
+   case 64: PointerType = MVT::i64; break;
+   }
+ 
+   // Create all of the machine basic blocks for the function... building the
+   // BlockMap.  This map is used for PHI node conversion.
+   const Function &Fn = *F.getFunction();
+   for (Function::const_iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
+     F.getBasicBlockList().push_back(BlockMap[I] = new MachineBasicBlock(I));
+ 
+   SDTB.expandArguments(*this, f);
+ 
+   SelectionDAGBuilder SDB(*this);
+   for (Function::const_iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
+     SDB.visitBB(const_cast<BasicBlock&>(*I));
+   Root = SDB.CurRoot;
+ }


Index: llvm/lib/CodeGen/Selection/Makefile
diff -c /dev/null llvm/lib/CodeGen/Selection/Makefile:1.1
*** /dev/null	Mon Aug 11 09:57:43 2003
--- llvm/lib/CodeGen/Selection/Makefile	Mon Aug 11 09:57:33 2003
***************
*** 0 ****
--- 1,5 ----
+ LEVEL = ../../..
+ PARALLEL_DIRS =
+ LIBRARYNAME = selection
+ 
+ include $(LEVEL)/Makefile.common


Index: llvm/lib/CodeGen/Selection/SelectionDAG.cpp
diff -c /dev/null llvm/lib/CodeGen/Selection/SelectionDAG.cpp:1.1
*** /dev/null	Mon Aug 11 09:57:43 2003
--- llvm/lib/CodeGen/Selection/SelectionDAG.cpp	Mon Aug 11 09:57:33 2003
***************
*** 0 ****
--- 1,105 ----
+ //===-- SelectionDAG.cpp - Implement the SelectionDAG* classes ------------===//
+ //
+ // This file implements the SelectionDAG* classes, which are used to perform
+ // DAG-based instruction selection in a target-specific manner.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "llvm/CodeGen/SelectionDAG.h"
+ #include "llvm/Type.h"
+ 
+ SelectionDAG::~SelectionDAG() {
+   for (unsigned i = 0, e = AllNodes.size(); i != e; ++i)
+     delete AllNodes[i];
+ }
+ 
+ 
+ /// dump - Print out the current Selection DAG...
+ void SelectionDAG::dump() const {
+   Root->dump();  // Print from the root...
+ }
+ 
+ /// getValueType - Return the ValueType for the specified LLVM type.  This
+ /// method works on all scalar LLVM types.
+ ///
+ MVT::ValueType SelectionDAG::getValueType(const Type *Ty) const {
+   switch (Ty->getPrimitiveID()) {
+   case Type::VoidTyID: assert(0 && "Void type object in getValueType!");
+   default: assert(0 && "Unknown type in DAGBuilder!\n");
+   case Type::BoolTyID:    return MVT::i1;
+   case Type::SByteTyID:
+   case Type::UByteTyID:   return MVT::i8;
+   case Type::ShortTyID:
+   case Type::UShortTyID:  return MVT::i16;
+   case Type::IntTyID:
+   case Type::UIntTyID:    return MVT::i32;
+   case Type::LongTyID:
+   case Type::ULongTyID:   return MVT::i64;
+   case Type::FloatTyID:   return MVT::f32;
+   case Type::DoubleTyID:  return MVT::f64;
+   case Type::PointerTyID: return PointerType;
+   }
+ }
+ 
+ void SelectionDAGNode::dump() const {
+   // Print out the DAG in post-order
+   std::map<const SelectionDAGNode*, unsigned> NodeIDs;
+   unsigned ID = 0;
+   printit(0, ID, NodeIDs);
+ }
+ 
+ void SelectionDAGNode::printit(unsigned Offset, unsigned &LastID,
+                                std::map<const SelectionDAGNode*,
+                                         unsigned> &NodeIDs) const {
+   if (!NodeIDs.count(this)) {
+     // Emit all of the uses first...
+     for (unsigned i = 0, e = Uses.size(); i != e; ++i)
+       Uses[i]->printit(Offset+1, LastID, NodeIDs);
+ 
+     NodeIDs[this] = LastID++;
+ 
+     std::cerr << std::string(Offset, ' ') << "#" << LastID-1 << " ";
+   } else {
+     // Node has already been emitted...
+     std::cerr << std::string(Offset, ' ') << "#" << NodeIDs[this] << " ";
+   }
+ 
+   switch (ValueType) {
+   case MVT::isVoid: std::cerr << "V:"; break;
+   case MVT::i1:   std::cerr << "i1:"; break;
+   case MVT::i8:   std::cerr << "i8:"; break;
+   case MVT::i16:  std::cerr << "i16:"; break;
+   case MVT::i32:  std::cerr << "i32:"; break;
+   case MVT::i64:  std::cerr << "i64:"; break;
+   case MVT::f32:  std::cerr << "f32:"; break;
+   case MVT::f64:  std::cerr << "f64:"; break;
+   default: assert(0 && "Invalid node ValueType!");
+   }
+   switch (NodeType) {
+   case ISD::ChainNode:      std::cerr << "ChainNode"; break;
+   case ISD::BlockChainNode: std::cerr << "BlockChainNode"; break;
+   case ISD::ProtoNode:      std::cerr << "ProtoNode"; break;
+   case ISD::Constant:       std::cerr << "Constant"; break;
+   case ISD::FrameIndex:     std::cerr << "FrameIndex"; break;
+   case ISD::Plus:           std::cerr << "Plus"; break;
+   case ISD::Minus:          std::cerr << "Minus"; break;
+   case ISD::Times:          std::cerr << "Times"; break;
+   case ISD::SDiv:           std::cerr << "SDiv"; break;
+   case ISD::UDiv:           std::cerr << "UDiv"; break;
+   case ISD::SRem:           std::cerr << "SRem"; break;
+   case ISD::URem:           std::cerr << "URem"; break;
+   case ISD::And:            std::cerr << "And"; break;
+   case ISD::Or:             std::cerr << "Or"; break;
+   case ISD::Xor:            std::cerr << "Xor"; break;
+   case ISD::Br:             std::cerr << "Br"; break;
+   case ISD::Switch:         std::cerr << "Switch"; break;
+   case ISD::Ret:            std::cerr << "Ret"; break;
+   case ISD::RetVoid:        std::cerr << "RetVoid"; break;
+   case ISD::Load:           std::cerr << "Load"; break;
+   case ISD::Store:          std::cerr << "Store"; break;
+   case ISD::PHI:            std::cerr << "PHI"; break;
+   case ISD::Call:           std::cerr << "Call"; break;
+   }
+ 
+   std::cerr << "\n";
+ }




From lattner at cs.uiuc.edu  Mon Aug 11 10:00:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:00:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectPattern.cpp Makefile X86.h X86TargetMachine.cpp
Message-ID: <200308111459.JAA04562@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

InstSelectPattern.cpp added (r1.1)
Makefile updated: 1.3 -> 1.4
X86.h updated: 1.17 -> 1.18
X86TargetMachine.cpp updated: 1.21 -> 1.22

---
Log message:

Add support for a pattern matching instruction selector.  This is still in
the early implementation phases, so it is disabled by default


---
Diffs of the changes:

Index: llvm/lib/Target/X86/InstSelectPattern.cpp
diff -c /dev/null llvm/lib/Target/X86/InstSelectPattern.cpp:1.1
*** /dev/null	Mon Aug 11 09:59:32 2003
--- llvm/lib/Target/X86/InstSelectPattern.cpp	Mon Aug 11 09:59:22 2003
***************
*** 0 ****
--- 1,117 ----
+ //===-- InstSelectPattern.cpp - A pattern matching inst selector for X86 --===//
+ //
+ // This file defines a pattern matching instruction selector for X86.
+ //
+ //  FIXME: we could allocate one big array of unsigneds to use as the backing
+ //         store for all of the nodes costs arrays.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "X86.h"
+ #include "llvm/Pass.h"
+ #include "llvm/Function.h"
+ #include "llvm/DerivedTypes.h"
+ #include "llvm/CodeGen/SelectionDAG.h"
+ #include "llvm/CodeGen/MachineFunction.h"
+ #include "llvm/CodeGen/MachineFrameInfo.h"
+ #include "llvm/CodeGen/SSARegMap.h"
+ 
+ #include "X86RegisterInfo.h"
+ 
+ // Include the generated instruction selector...
+ #include "X86GenInstrSelector.inc"
+ 
+ 
+ //===----------------------------------------------------------------------===//
+ //  User code
+ //
+ 
+ 
+ namespace {
+   struct ISel : public FunctionPass, SelectionDAGTargetBuilder {
+     TargetMachine &TM;
+     ISel(TargetMachine &tm) : TM(tm) {}
+     int VarArgsFrameIndex;              // FrameIndex for start of varargs area
+ 
+     bool runOnFunction(Function &Fn) {
+       MachineFunction &MF = MachineFunction::construct(&Fn, TM);
+       SelectionDAG DAG(MF, TM, *this);
+ 
+       std::cerr << "\n\n\n=== "
+                 << DAG.getMachineFunction().getFunction()->getName() << "\n";
+ 
+       DAG.dump();
+       X86ISel(DAG).generateCode();
+       std::cerr << "\n\n\n";
+       return true;
+     }
+ 
+   public:  // Implementation of the SelectionDAGTargetBuilder class...
+     /// expandArguments - Add nodes to the DAG to indicate how to load arguments
+     /// off of the X86 stack.
+     void expandArguments(SelectionDAG &SD, MachineFunction &MF);
+   };
+ }
+ 
+ 
+ void ISel::expandArguments(SelectionDAG &SD, MachineFunction &F) {
+   // Add DAG nodes to load the arguments...  On entry to a function on the X86,
+   // the stack frame looks like this:
+   //
+   // [ESP] -- return address
+   // [ESP + 4] -- first argument (leftmost lexically)
+   // [ESP + 8] -- second argument, if first argument is four bytes in size
+   //    ... 
+   //
+   unsigned ArgOffset = 0;   // Frame mechanisms handle retaddr slot
+   MachineFrameInfo *MFI = F.getFrameInfo();
+   const Function &Fn = *F.getFunction();
+   
+   for (Function::const_aiterator I = Fn.abegin(), E = Fn.aend(); I != E; ++I) {
+     MVT::ValueType ObjectVT = SD.getValueType(I->getType());
+     unsigned ArgIncrement = 4;
+     unsigned ObjSize;
+     switch (ObjectVT) {
+     default: assert(0 && "Unhandled argument type!");
+     case MVT::i8:  ObjSize = 1;                break;
+     case MVT::i16: ObjSize = 2;                break;
+     case MVT::i32: ObjSize = 4;                break;
+     case MVT::i64: ObjSize = ArgIncrement = 8; break;
+     case MVT::f32: ObjSize = 4;                break;
+     case MVT::f64: ObjSize = ArgIncrement = 8; break;
+     }
+     // Create the frame index object for this incoming parameter...
+     int FI = MFI->CreateFixedObject(ObjSize, ArgOffset);
+     
+     // Create the SelectionDAG nodes corresponding to a load from this parameter
+     // FIXME:
+     SelectionDAGNode *FIN = new SelectionDAGNode(ISD::FrameIndex, MVT::i32);
+     FIN->addValue(new ReducedValue_FrameIndex_i32(FI));
+ 
+     SelectionDAGNode *Arg
+       = new SelectionDAGNode(ISD::Load, ObjectVT, F.begin(), FIN);
+ 
+     // Add the SelectionDAGNodes to the SelectionDAG... note that there is no
+     // reason to add chain nodes here.  We know that no loads ore stores will
+     // ever alias these loads, so we are free to perform the load at any time in
+     // the function
+     SD.addNode(FIN);
+     SD.addNodeForValue(Arg, I);
+ 
+     ArgOffset += ArgIncrement;   // Move on to the next argument...
+   }
+ 
+   // If the function takes variable number of arguments, make a frame index for
+   // the start of the first vararg value... for expansion of llvm.va_start.
+   if (Fn.getFunctionType()->isVarArg())
+     VarArgsFrameIndex = MFI->CreateFixedObject(1, ArgOffset);
+ }
+ 
+ 
+ /// createX86PatternInstructionSelector - This pass converts an LLVM function
+ /// into a machine code representation using pattern matching and a machine
+ /// description file.
+ ///
+ Pass *createX86PatternInstructionSelector(TargetMachine &TM) {
+   return new ISel(TM);  
+ }


Index: llvm/lib/Target/X86/Makefile
diff -u llvm/lib/Target/X86/Makefile:1.3 llvm/lib/Target/X86/Makefile:1.4
--- llvm/lib/Target/X86/Makefile:1.3	Sun Aug  3 16:54:59 2003
+++ llvm/lib/Target/X86/Makefile	Mon Aug 11 09:59:22 2003
@@ -5,22 +5,25 @@
 # Make sure that tblgen is run, first thing.
 $(SourceDepend): X86GenRegisterInfo.h.inc X86GenRegisterNames.inc \
                  X86GenRegisterInfo.inc X86GenInstrNames.inc \
-                 X86GenInstrInfo.inc
+                 X86GenInstrInfo.inc X86GenInstrSelector.inc
 
-X86GenRegisterNames.inc:  X86.td X86RegisterInfo.td $(TBLGEN)
-	$(TBLGEN) X86.td -gen-register-enums -o $@
+X86GenRegisterNames.inc:  X86.td X86RegisterInfo.td ../Target.td $(TBLGEN)
+	$(TBLGEN) $< -gen-register-enums -o $@
 
-X86GenRegisterInfo.h.inc: X86.td X86RegisterInfo.td $(TBLGEN)
-	$(TBLGEN) X86.td -gen-register-desc-header -o $@
+X86GenRegisterInfo.h.inc: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN)
+	$(TBLGEN) $< -gen-register-desc-header -o $@
 
-X86GenRegisterInfo.inc: X86.td X86RegisterInfo.td $(TBLGEN)
-	$(TBLGEN) X86.td -gen-register-desc -o $@
+X86GenRegisterInfo.inc: X86.td X86RegisterInfo.td ../Target.td $(TBLGEN)
+	$(TBLGEN) $< -gen-register-desc -o $@
 
-X86GenInstrNames.inc: X86.td X86InstrInfo.td $(TBLGEN)
-	$(TBLGEN) X86.td -gen-instr-enums -o $@
+X86GenInstrNames.inc: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
+	$(TBLGEN) $< -gen-instr-enums -o $@
 
-X86GenInstrInfo.inc: X86.td X86InstrInfo.td $(TBLGEN)
-	$(TBLGEN) X86.td -gen-instr-desc -o $@
+X86GenInstrInfo.inc: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
+	$(TBLGEN) $< -gen-instr-desc -o $@
+
+X86GenInstrSelector.inc: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
+	$(TBLGEN) $< -gen-instr-selector -o $@
 
 clean::
 	$(VERB) rm -f *.inc


Index: llvm/lib/Target/X86/X86.h
diff -u llvm/lib/Target/X86/X86.h:1.17 llvm/lib/Target/X86/X86.h:1.18
--- llvm/lib/Target/X86/X86.h:1.17	Sun Aug  3 16:57:05 2003
+++ llvm/lib/Target/X86/X86.h	Mon Aug 11 09:59:22 2003
@@ -18,6 +18,12 @@
 ///
 Pass *createX86SimpleInstructionSelector(TargetMachine &TM);
 
+/// createX86PatternInstructionSelector - This pass converts an LLVM function
+/// into a machine code representation using pattern matching and a machine
+/// description file.
+///
+Pass *createX86PatternInstructionSelector(TargetMachine &TM);
+
 /// createX86PeepholeOptimizer - Create a pass to perform X86 specific peephole
 /// optimizations.
 ///


Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.21 llvm/lib/Target/X86/X86TargetMachine.cpp:1.22
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.21	Tue Aug  5 11:34:44 2003
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Mon Aug 11 09:59:22 2003
@@ -20,6 +20,8 @@
                           cl::desc("Use Simple RA instead of Local RegAlloc"));
   cl::opt<bool> PrintCode("print-machineinstrs",
 			  cl::desc("Print generated machine code"));
+  cl::opt<bool> NoPatternISel("disable-pattern-isel", cl::init(true),
+                        cl::desc("Use the 'simple' X86 instruction selector"));
 }
 
 // allocateX86TargetMachine - Allocate and return a subclass of TargetMachine
@@ -59,7 +61,10 @@
   // FIXME: Implement the switch instruction in the instruction selector!
   PM.add(createLowerSwitchPass());
 
-  PM.add(createX86SimpleInstructionSelector(*this));
+  if (NoPatternISel)
+    PM.add(createX86SimpleInstructionSelector(*this));
+  else
+    PM.add(createX86PatternInstructionSelector(*this));
 
   // TODO: optional optimizations go here
 




From lattner at cs.uiuc.edu  Mon Aug 11 10:01:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:01:00 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Makefile
Message-ID: <200308111500.KAA04616@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

Makefile updated: 1.34 -> 1.35

---
Log message:

Include the new selection library for the X86 target



---
Diffs of the changes:

Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.34 llvm/tools/lli/Makefile:1.35
--- llvm/tools/lli/Makefile:1.34	Mon Jul 28 14:06:19 2003
+++ llvm/tools/lli/Makefile	Mon Aug 11 09:59:53 2003
@@ -19,7 +19,7 @@
 # What the X86 JIT requires
 ifdef ENABLE_X86_JIT
   CPPFLAGS += -DENABLE_X86_JIT
-  JITLIBS  += x86
+  JITLIBS  += x86 selection
   # X86 doesn't require any ARCHLIBS
 endif
 




From lattner at cs.uiuc.edu  Mon Aug 11 10:01:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:01:02 2003
Subject: [llvm-commits] CVS: llvm/tools/llc/Makefile
Message-ID: <200308111500.KAA04609@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/llc:

Makefile updated: 1.37 -> 1.38

---
Log message:

Include the new selection library for the X86 target


---
Diffs of the changes:

Index: llvm/tools/llc/Makefile
diff -u llvm/tools/llc/Makefile:1.37 llvm/tools/llc/Makefile:1.38
--- llvm/tools/llc/Makefile:1.37	Wed Jun 18 16:14:23 2003
+++ llvm/tools/llc/Makefile	Mon Aug 11 09:59:51 2003
@@ -3,6 +3,7 @@
 USEDLIBS = mapping \
            sparc \
            x86 \
+	   selection \
            regalloc \
            sched \
            select \




From lattner at cs.uiuc.edu  Mon Aug 11 10:06:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:06:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/RaiseAllocations.cpp
Message-ID: <200308111505.KAA08298@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

RaiseAllocations.cpp updated: 1.14 -> 1.15

---
Log message:

Fix handling of 'free' if it has absolutely no prototype


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/RaiseAllocations.cpp
diff -u llvm/lib/Transforms/Scalar/RaiseAllocations.cpp:1.14 llvm/lib/Transforms/Scalar/RaiseAllocations.cpp:1.15
--- llvm/lib/Transforms/Scalar/RaiseAllocations.cpp:1.14	Tue Oct  1 17:38:41 2002
+++ llvm/lib/Transforms/Scalar/RaiseAllocations.cpp	Mon Aug 11 10:05:08 2003
@@ -93,6 +93,13 @@
     FreeFunc = M.getFunction("free", FreeType);
   }
 
+  // One last try, check to see if we can find free as 'int (...)* free'.  This
+  // handles the case where NOTHING was declared.
+  if (FreeFunc == 0) {
+    FreeType = FunctionType::get(Type::IntTy, std::vector<const Type*>(),true);
+    FreeFunc = M.getFunction("free", FreeType);
+  }
+
 
   // Don't mess with locally defined versions of these functions...
   if (MallocFunc && !MallocFunc->isExternal()) MallocFunc = 0;




From lattner at cs.uiuc.edu  Mon Aug 11 10:12:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:12:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Makefile
Message-ID: <200308111511.KAA11186@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Makefile updated: 1.4 -> 1.5

---
Log message:

Until the pattern matching instruction selector is finished, enable debug output from it


---
Diffs of the changes:

Index: llvm/lib/Target/X86/Makefile
diff -u llvm/lib/Target/X86/Makefile:1.4 llvm/lib/Target/X86/Makefile:1.5
--- llvm/lib/Target/X86/Makefile:1.4	Mon Aug 11 09:59:22 2003
+++ llvm/lib/Target/X86/Makefile	Mon Aug 11 10:11:01 2003
@@ -23,7 +23,7 @@
 	$(TBLGEN) $< -gen-instr-desc -o $@
 
 X86GenInstrSelector.inc: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -gen-instr-selector -o $@
+	$(TBLGEN) $< -debug -gen-instr-selector -o $@
 
 clean::
 	$(VERB) rm -f *.inc




From brukman at cs.uiuc.edu  Mon Aug 11 10:17:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 10:17:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp
Message-ID: <200308111516.KAA04927@zion.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.21 -> 1.22

---
Log message:

Put printouts of acquired patterns under the DEBUG() guard, fixed spelling.


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.21 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.22
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.21	Sun Aug 10 18:51:52 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 10:16:12 2003
@@ -905,11 +905,11 @@
   // Clear InstantiatedNTs, we don't need it anymore...
   InstantiatedNTs.clear();
 
-  std::cerr << "Patterns aquired:\n";
+  DEBUG(std::cerr << "Patterns acquired:\n");
   for (std::map<Record*, Pattern*>::iterator I = Patterns.begin(),
          E = Patterns.end(); I != E; ++I)
     if (I->second->isResolved())
-      std::cerr << "  " << *I->second << "\n";
+      DEBUG(std::cerr << "  " << *I->second << "\n");
 
   CalculateComputableValues();
   




From lattner at cs.uiuc.edu  Mon Aug 11 10:24:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:24:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Target.td
Message-ID: <200308111523.KAA16185@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

Target.td updated: 1.17 -> 1.18

---
Log message:

add support for more nodes


---
Diffs of the changes:

Index: llvm/lib/Target/Target.td
diff -u llvm/lib/Target/Target.td:1.17 llvm/lib/Target/Target.td:1.18
--- llvm/lib/Target/Target.td:1.17	Sun Aug 10 14:51:16 2003
+++ llvm/lib/Target/Target.td	Mon Aug 11 10:23:05 2003
@@ -184,11 +184,15 @@
 // Arithmetic...
 def plus    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Plus">;
 def minus   : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Minus">;
-//def mult    : DagNode<2, DNVT_arg0>;
-//def div     : DagNode<2, DNVT_arg0>;
-//def udiv    : DagNode<2, DNVT_arg0>;
-//def mod     : DagNode<2, DNVT_arg0>;
-//def umod    : DagNode<2, DNVT_arg0>;
+def times   : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Times">;
+def sdiv    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "SDiv">;
+def udiv    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "UDiv">;
+def srem    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "SRem">;
+def urem    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "URem">;
+def and     : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "And">;
+def or      : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Or">;
+def xor     : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Xor">;
+
 
 def load    : DagNode<DNVT_val, [DNVT_ptr]>;
 //def store   : DagNode<2, DNVT_Void>;




From lattner at cs.uiuc.edu  Mon Aug 11 10:24:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:24:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrInfo.td
Message-ID: <200308111523.KAA16207@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86InstrInfo.td updated: 1.6 -> 1.7

---
Log message:

Add patterns for multiply, and, or, and xor


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.6 llvm/lib/Target/X86/X86InstrInfo.td:1.7
--- llvm/lib/Target/X86/X86InstrInfo.td:1.6	Wed Aug  6 10:31:35 2003
+++ llvm/lib/Target/X86/X86InstrInfo.td	Mon Aug 11 10:23:25 2003
@@ -235,30 +235,30 @@
 
 def SBBrr32  : I2A32<"sbb", 0x19, MRMDestReg>;                // R32 -= R32+Carry
 
-def IMULr16  : I2A16<"imul", 0xAF, MRMSrcReg>, TB, OpSize;    // R16 *= R16
-def IMULr32  : I2A32<"imul", 0xAF, MRMSrcReg>, TB;            // R32 *= R32
+def IMULr16  : I2A16<"imul", 0xAF, MRMSrcReg>, TB, OpSize, Pattern<(set R16, (times R16, R16))>;
+def IMULr32  : I2A32<"imul", 0xAF, MRMSrcReg>, TB        , Pattern<(set R32, (times R32, R32))>;
 
 // Logical operators...
-def ANDrr8   : I2A8 <"and", 0x20, MRMDestReg>;                // R8  &= R8
-def ANDrr16  : I2A16<"and", 0x21, MRMDestReg>, OpSize;        // R16 &= R16
-def ANDrr32  : I2A32<"and", 0x21, MRMDestReg>;                // R32 &= R32
-def ANDri8   : I2A8 <"and", 0x80, MRMS4r    >;                // R8  &= imm8
-def ANDri16  : I2A16<"and", 0x81, MRMS4r    >, OpSize;        // R16 &= imm16
-def ANDri32  : I2A32<"and", 0x81, MRMS4r    >;                // R32 &= imm32
+def ANDrr8   : I2A8 <"and", 0x20, MRMDestReg>,         Pattern<(set R8 , (and R8 , R8 ))>;
+def ANDrr16  : I2A16<"and", 0x21, MRMDestReg>, OpSize, Pattern<(set R16, (and R16, R16))>;
+def ANDrr32  : I2A32<"and", 0x21, MRMDestReg>,         Pattern<(set R32, (and R32, R32))>;
+def ANDri8   : I2A8 <"and", 0x80, MRMS4r    >,         Pattern<(set R8 , (and R8 , imm))>;
+def ANDri16  : I2A16<"and", 0x81, MRMS4r    >, OpSize, Pattern<(set R16, (and R16, imm))>;
+def ANDri32  : I2A32<"and", 0x81, MRMS4r    >,         Pattern<(set R32, (and R32, imm))>;
 
-def ORrr8    : I2A8 <"or" , 0x08, MRMDestReg>;                // R8  |= R8
-def ORrr16   : I2A16<"or" , 0x09, MRMDestReg>, OpSize;        // R16 |= R16
-def ORrr32   : I2A32<"or" , 0x09, MRMDestReg>;                // R32 |= R32
-def ORri8    : I2A8 <"or" , 0x80, MRMS1r    >;                // R8  |= imm8
-def ORri16   : I2A16<"or" , 0x81, MRMS1r    >, OpSize;        // R16 |= imm16
-def ORri32   : I2A32<"or" , 0x81, MRMS1r    >;                // R32 |= imm32
+def ORrr8    : I2A8 <"or" , 0x08, MRMDestReg>,         Pattern<(set R8 , (or  R8 , R8 ))>;
+def ORrr16   : I2A16<"or" , 0x09, MRMDestReg>, OpSize, Pattern<(set R16, (or  R16, R16))>;
+def ORrr32   : I2A32<"or" , 0x09, MRMDestReg>,         Pattern<(set R32, (or  R32, R32))>;
+def ORri8    : I2A8 <"or" , 0x80, MRMS1r    >,         Pattern<(set R8 , (or  R8 , imm))>;
+def ORri16   : I2A16<"or" , 0x81, MRMS1r    >, OpSize, Pattern<(set R16, (or  R16, imm))>;
+def ORri32   : I2A32<"or" , 0x81, MRMS1r    >,         Pattern<(set R32, (or  R32, imm))>;
 
-def XORrr8   : I2A8 <"xor", 0x30, MRMDestReg>;                // R8  ^= R8
-def XORrr16  : I2A16<"xor", 0x31, MRMDestReg>, OpSize;        // R16 ^= R16
-def XORrr32  : I2A32<"xor", 0x31, MRMDestReg>;                // R32 ^= R32
-def XORri8   : I2A8 <"xor", 0x80, MRMS6r    >;                // R8  ^= imm8
-def XORri16  : I2A16<"xor", 0x81, MRMS6r    >, OpSize;        // R16 ^= imm16
-def XORri32  : I2A32<"xor", 0x81, MRMS6r    >;                // R32 ^= imm32
+def XORrr8   : I2A8 <"xor", 0x30, MRMDestReg>,         Pattern<(set R8 , (xor R8 , R8 ))>;
+def XORrr16  : I2A16<"xor", 0x31, MRMDestReg>, OpSize, Pattern<(set R16, (xor R16, R16))>;
+def XORrr32  : I2A32<"xor", 0x31, MRMDestReg>,         Pattern<(set R32, (xor R32, R32))>;
+def XORri8   : I2A8 <"xor", 0x80, MRMS6r    >,         Pattern<(set R8 , (xor R8 , imm))>;
+def XORri16  : I2A16<"xor", 0x81, MRMS6r    >, OpSize, Pattern<(set R16, (xor R16, imm))>;
+def XORri32  : I2A32<"xor", 0x81, MRMS6r    >,         Pattern<(set R32, (xor R32, imm))>;
 
 // Test instructions are just like AND, except they don't generate a result.
 def TESTrr8  : X86Inst<"test", 0x84, MRMDestReg, Arg8 >;          // flags = R8  & R8




From lattner at cs.uiuc.edu  Mon Aug 11 10:25:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:25:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Target.td
Message-ID: <200308111524.KAA16255@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

Target.td updated: 1.18 -> 1.19

---
Log message:

Remove dead code


---
Diffs of the changes:

Index: llvm/lib/Target/Target.td
diff -u llvm/lib/Target/Target.td:1.18 llvm/lib/Target/Target.td:1.19
--- llvm/lib/Target/Target.td:1.18	Mon Aug 11 10:23:05 2003
+++ llvm/lib/Target/Target.td	Mon Aug 11 10:24:02 2003
@@ -209,6 +209,3 @@
   bit BuiltIn = 0;
 }
 
-// imm - Immediate value...
-//def imm : Nonterminal<(Constant)> { let BuiltIn = 1; }
-




From brukman at cs.uiuc.edu  Mon Aug 11 10:31:00 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 10:31:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Makefile
Message-ID: <200308111530.KAA06698@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Makefile updated: 1.5 -> 1.6

---
Log message:

Removed `-debug' so that spurious printouts of patterns are not seen at
compilation time.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/Makefile
diff -u llvm/lib/Target/X86/Makefile:1.5 llvm/lib/Target/X86/Makefile:1.6
--- llvm/lib/Target/X86/Makefile:1.5	Mon Aug 11 10:11:01 2003
+++ llvm/lib/Target/X86/Makefile	Mon Aug 11 10:30:20 2003
@@ -23,7 +23,7 @@
 	$(TBLGEN) $< -gen-instr-desc -o $@
 
 X86GenInstrSelector.inc: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -debug -gen-instr-selector -o $@
+	$(TBLGEN) $< -gen-instr-selector -o $@
 
 clean::
 	$(VERB) rm -f *.inc




From brukman at cs.uiuc.edu  Mon Aug 11 10:40:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 10:40:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86RegisterInfo.td
Message-ID: <200308111539.KAA06757@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86RegisterInfo.td updated: 1.6 -> 1.7

---
Log message:

Converted tabs to spaces.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86RegisterInfo.td
diff -u llvm/lib/Target/X86/X86RegisterInfo.td:1.6 llvm/lib/Target/X86/X86RegisterInfo.td:1.7
--- llvm/lib/Target/X86/X86RegisterInfo.td:1.6	Wed Aug  6 23:49:16 2003
+++ llvm/lib/Target/X86/X86RegisterInfo.td	Mon Aug 11 10:38:50 2003
@@ -74,9 +74,9 @@
   let Methods = [{
     iterator allocation_order_end(MachineFunction &MF) const {
       if (hasFP(MF))     // Does the function dedicate EBP to being a frame ptr?
-	return end()-2;  // If so, don't allocate SP or BP
+        return end()-2;  // If so, don't allocate SP or BP
       else
-	return end()-1;  // If not, just don't allocate SP
+        return end()-1;  // If not, just don't allocate SP
     }
   }];
 }




From lattner at cs.uiuc.edu  Mon Aug 11 10:48:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:48:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp
Message-ID: <200308111547.KAA26099@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.22 -> 1.23

---
Log message:

Don't forget to initializer result field to 0!


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.22 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.23
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.22	Mon Aug 11 10:16:12 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 10:47:35 2003
@@ -116,7 +116,7 @@
 //
 Pattern::Pattern(PatternType pty, DagInit *RawPat, Record *TheRec,
                  InstrSelectorEmitter &ise)
-  : PTy(pty), TheRecord(TheRec), ISE(ise) {
+  : PTy(pty), Result(0), TheRecord(TheRec), ISE(ise) {
 
   // First, parse the pattern...
   Tree = ParseTreePattern(RawPat);




From lattner at cs.uiuc.edu  Mon Aug 11 10:49:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 10:49:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrInfo.td
Message-ID: <200308111548.KAA26117@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86InstrInfo.td updated: 1.7 -> 1.8

---
Log message:

Add (ret int) expander so that we can at least write testcases


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.7 llvm/lib/Target/X86/X86InstrInfo.td:1.8
--- llvm/lib/Target/X86/X86InstrInfo.td:1.7	Mon Aug 11 10:23:25 2003
+++ llvm/lib/Target/X86/X86InstrInfo.td	Mon Aug 11 10:48:00 2003
@@ -430,3 +430,12 @@
 def FNSTSWr8  : X86Inst<"fnstsw" , 0xE0, RawFrm   , ArgF80>, DF, Imp<[],[AX]>;   // AX = fp flags
 def FNSTCWm16 : X86Inst<"fnstcw" , 0xD9, MRMS7m   , Arg16 >;                     // [mem16] = X87 control world
 def FLDCWm16  : X86Inst<"fldcw"  , 0xD9, MRMS5m   , Arg16 >;                     // X87 control world = [mem16]
+
+
+//===----------------------------------------------------------------------===//
+//  Instruction Expanders
+//
+
+def RET_R32 : Expander<(ret R32:$reg),
+                       [(MOVrr32 EAX, R32:$reg),
+                        (RET)]>;




From gaeke at niobe.cs.uiuc.edu  Mon Aug 11 12:07:04 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Mon Aug 11 12:07:04 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/README
Message-ID: <200308111706.h7BH6FY17691@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer:

README updated: 1.1 -> 1.2

---
Log message:

Update description of newer reoptimizer.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/README
diff -u llvm/lib/Reoptimizer/README:1.1 llvm/lib/Reoptimizer/README:1.2
--- llvm/lib/Reoptimizer/README:1.1	Tue Aug  5 14:37:15 2003
+++ llvm/lib/Reoptimizer/README	Mon Aug 11 12:06:04 2003
@@ -18,7 +18,8 @@
    assembly by LLC. 
 
 LightWtProfiling/Trigger
- - Anand's redesigned reoptimizer.
+ - Anand's redesigned reoptimizer. Uses first-level and second-level
+   instrumentation.
 
 TraceCache
  - Manages traces for the reoptimizers.




From brukman at cs.uiuc.edu  Mon Aug 11 12:57:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 12:57:01 2003
Subject: [llvm-commits] CVS: llvm/utils/vim/README tablegen.vim
Message-ID: <200308111756.MAA07113@zion.cs.uiuc.edu>


Changes in directory llvm/utils/vim:

README added (r1.1)
tablegen.vim added (r1.1)

---
Log message:

Added a TableGen syntax highlighting mode for VIM and a README that describes
how to add the functionality to the user's VIM installation.


---
Diffs of the changes:

Index: llvm/utils/vim/README
diff -c /dev/null llvm/utils/vim/README:1.1
*** /dev/null	Mon Aug 11 12:56:18 2003
--- llvm/utils/vim/README	Mon Aug 11 12:56:08 2003
***************
*** 0 ****
--- 1,29 ----
+ -*- llvm/utils/vim/README -*-
+ 
+ These are syntax highlighting files for the VIM editor. Included are:
+ 
+ * llvm.vim
+ 
+   Syntax highlighting mode for LLVM assembly files. To use, COPY `llvm.vim' to
+   ~/.vim/syntax and add this code to your ~/.vimrc :
+ 
+   augroup filetype
+     au! BufRead,BufNewFile *.ll     set filetype=llvm
+   augroup END
+ 
+ * tablegen.vim
+ 
+   Syntax highlighting mode for TableGen description files. To use, COPY
+   `tablegen.vim' to ~/.vim/syntax and add this code to your ~/.vimrc :
+ 
+   augroup filetype
+     au! BufRead,BufNewFile *.td     set filetype=tablegen
+   augroup END
+ 
+ 
+ IMPORTANT: Making symlinks from ~/.vim/syntax/... to the syntax files in your
+ LLVM source tree does not work, you DO need to copy the files directly.
+ 
+ Note: If you notice missing or incorrect syntax highlighting, please contact
+ <llvmbugs [at] cs.uiuc.edu>; if you wish to provide a patch to improve the
+ functionality, it will be most appreciated. Thank you.


Index: llvm/utils/vim/tablegen.vim
diff -c /dev/null llvm/utils/vim/tablegen.vim:1.1
*** /dev/null	Mon Aug 11 12:56:18 2003
--- llvm/utils/vim/tablegen.vim	Mon Aug 11 12:56:08 2003
***************
*** 0 ****
--- 1,39 ----
+ " Vim syntax file
+ " Language:   TableGen
+ " Maintainer: The LLVM team, http://llvm.cs.uiuc.edu/
+ " Updated:    2003-08-11
+ 
+ if version < 600
+   syntax clear
+ elseif exists("b:current_syntax")
+   finish
+ endif
+ 
+ syn case match
+ 
+ syn keyword tgKeyword   def let in code dag
+ syn keyword tgType      class int string list bit bits
+ syn match   tgNumber    /\<\d\+\>/
+ syn match   tgNumber    /\<\d\+\.\d*\>/
+ syn match   tgComment   /\/\/.*$/
+ syn region  tgString    start=/"/ skip=/\\"/ end=/"/
+ 
+ if version >= 508 || !exists("did_c_syn_inits")
+   if version < 508
+     let did_c_syn_inits = 1
+     command -nargs=+ HiLink hi link <args>
+   else
+     command -nargs=+ HiLink hi def link <args>
+   endif
+ 
+   HiLink tgKeyword Type
+   HiLink tgType Type
+   "HiLink llvmStatement Statement
+   HiLink tgNumber Number
+   HiLink tgComment Comment
+   HiLink tgString String
+ 
+   delcommand HiLink
+ endif
+  
+ let b:current_syntax = "tablegen"




From lattner at cs.uiuc.edu  Mon Aug 11 13:02:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 13:02:01 2003
Subject: [llvm-commits] CVS: llvm/utils/vim/README
Message-ID: <200308111801.NAA27056@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/vim:

README updated: 1.1 -> 1.2

---
Log message:

Add .llx 


---
Diffs of the changes:

Index: llvm/utils/vim/README
diff -u llvm/utils/vim/README:1.1 llvm/utils/vim/README:1.2
--- llvm/utils/vim/README:1.1	Mon Aug 11 12:56:08 2003
+++ llvm/utils/vim/README	Mon Aug 11 13:01:39 2003
@@ -9,6 +9,7 @@
 
   augroup filetype
     au! BufRead,BufNewFile *.ll     set filetype=llvm
+    au! BufRead,BufNewFile *.llx    set filetype=llvm
   augroup END
 
 * tablegen.vim




From brukman at cs.uiuc.edu  Mon Aug 11 13:06:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 13:06:02 2003
Subject: [llvm-commits] CVS: llvm/utils/vim/README tablegen.vim
Message-ID: <200308111805.NAA07236@zion.cs.uiuc.edu>


Changes in directory llvm/utils/vim:

README updated: 1.2 -> 1.3
tablegen.vim updated: 1.1 -> 1.2

---
Log message:

tablegen.vim:
* Added keyword `field'
* Keywords get different highlighting than types
* Added a simple attempt at multi-line C-style comments with FIXME

README:
* Added note about symlinking an entire directory ~/.vim/syntax


---
Diffs of the changes:

Index: llvm/utils/vim/README
diff -u llvm/utils/vim/README:1.2 llvm/utils/vim/README:1.3
--- llvm/utils/vim/README:1.2	Mon Aug 11 13:01:39 2003
+++ llvm/utils/vim/README	Mon Aug 11 13:05:19 2003
@@ -25,6 +25,10 @@
 IMPORTANT: Making symlinks from ~/.vim/syntax/... to the syntax files in your
 LLVM source tree does not work, you DO need to copy the files directly.
 
+However, if you do not already have a ~/.vim/syntax/ directory, simply
+symlinking it to llvm/utils/vim will do the trick nicely, and you can stay
+up-to-date with CVS.
+
 Note: If you notice missing or incorrect syntax highlighting, please contact
 <llvmbugs [at] cs.uiuc.edu>; if you wish to provide a patch to improve the
 functionality, it will be most appreciated. Thank you.


Index: llvm/utils/vim/tablegen.vim
diff -u llvm/utils/vim/tablegen.vim:1.1 llvm/utils/vim/tablegen.vim:1.2
--- llvm/utils/vim/tablegen.vim:1.1	Mon Aug 11 12:56:08 2003
+++ llvm/utils/vim/tablegen.vim	Mon Aug 11 13:05:19 2003
@@ -11,11 +11,13 @@
 
 syn case match
 
-syn keyword tgKeyword   def let in code dag
-syn keyword tgType      class int string list bit bits
+syn keyword tgKeyword   def let in code dag field
+syn keyword tgType      class int string list bit bits 
 syn match   tgNumber    /\<\d\+\>/
 syn match   tgNumber    /\<\d\+\.\d*\>/
 syn match   tgComment   /\/\/.*$/
+" FIXME: this does not capture multi-line C-style comments
+syn match   tgComment   /\/\*.*\*\//
 syn region  tgString    start=/"/ skip=/\\"/ end=/"/
 
 if version >= 508 || !exists("did_c_syn_inits")
@@ -26,9 +28,8 @@
     command -nargs=+ HiLink hi def link <args>
   endif
 
-  HiLink tgKeyword Type
+  HiLink tgKeyword Statement
   HiLink tgType Type
-  "HiLink llvmStatement Statement
   HiLink tgNumber Number
   HiLink tgComment Comment
   HiLink tgString String




From vadve at cs.uiuc.edu  Mon Aug 11 13:43:01 2003
From: vadve at cs.uiuc.edu (Vikram Adve)
Date: Mon Aug 11 13:43:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcInstrSelection.cpp
Message-ID: <200308111842.NAA28723@psmith.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcInstrSelection.cpp updated: 1.114 -> 1.115

---
Log message:

Register argument to va_start must be marked as defined!


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcInstrSelection.cpp
diff -u llvm/lib/Target/Sparc/SparcInstrSelection.cpp:1.114 llvm/lib/Target/Sparc/SparcInstrSelection.cpp:1.115
--- llvm/lib/Target/Sparc/SparcInstrSelection.cpp:1.114	Thu Aug  7 10:43:46 2003
+++ llvm/lib/Target/Sparc/SparcInstrSelection.cpp	Mon Aug 11 13:42:47 2003
@@ -1418,7 +1418,7 @@
     int firstVarArgOff = numFixedArgs * argSize + target.getFrameInfo().
       getFirstIncomingArgOffset(MachineFunction::get(func), ignore);
     mvec.push_back(BuildMI(V9::ADDi, 3).addMReg(fpReg).addSImm(firstVarArgOff).
-                   addReg(callInstr.getOperand(1)));
+                   addRegDef(callInstr.getOperand(1)));
     return true;
   }
 




From brukman at cs.uiuc.edu  Mon Aug 11 13:47:01 2003
From: brukman at cs.uiuc.edu (Michael Brukman)
Date: Mon Aug 11 13:47:01 2003
Subject: [llvm-commits] CVS: llvm/www/docs/GettingStarted.html
Message-ID: <200308111845.NAA24888@tank.cs.uiuc.edu>


Changes in directory llvm/www/docs:

GettingStarted.html updated: 1.29 -> 1.30

---
Log message:

* Added a section describing the hidden gems in llvm/utils
* Converted some tabs to spaces
* Made lines fit within 80 columns


---
Diffs of the changes:

Index: llvm/www/docs/GettingStarted.html
diff -u llvm/www/docs/GettingStarted.html:1.29 llvm/www/docs/GettingStarted.html:1.30
--- llvm/www/docs/GettingStarted.html:1.29	Fri Aug  8 17:46:30 2003
+++ llvm/www/docs/GettingStarted.html	Mon Aug 11 13:45:46 2003
@@ -8,7 +8,8 @@
     <center><h1>Getting Started with the LLVM System<br><font size=3>By: <a
     href="mailto:gshi1 at uiuc.edu">Guochun Shi</a>,
     <a href="mailto:sabre at nondot.org">Chris Lattner</a>,
-    <a href="mailto:criswell at uiuc.edu">John Criswell</a>, and
+    <a href="mailto:criswell at uiuc.edu">John Criswell</a>, 
+    <a href="http://misha.brukman.net">Misha Brukman</a>, and
     <a href="http://www.cs.uiuc.edu/~vadve">Vikram Adve</a>
     </font></h1></center>
 
@@ -38,13 +39,14 @@
           <li><a href="#objfiles">The Location of LLVM Object Files</tt></a>
         </ol>
       <li><a href="#layout">Program layout</a>
-	<ol>
-      <li><a href="#cvsdir"><tt>CVS</tt> directories</a>
-	  <li><a href="#include"><tt>llvm/include</tt></a>
-	  <li><a href="#lib"><tt>llvm/lib</tt></a>
-	  <li><a href="#test"><tt>llvm/test</tt></a>
-	  <li><a href="#tools"><tt>llvm/tools</tt></a>  
-	</ol>
+      <ol>
+        <li><a href="#cvsdir"><tt>CVS</tt> directories</a>
+        <li><a href="#include"><tt>llvm/include</tt></a>
+        <li><a href="#lib"><tt>llvm/lib</tt></a>
+        <li><a href="#test"><tt>llvm/test</tt></a>
+        <li><a href="#tools"><tt>llvm/tools</tt></a>  
+        <li><a href="#utils"><tt>llvm/utils</tt></a>
+    	</ol>
       <li><a href="#cfront">Compiling the LLVM C Front End</a>
       <li><a href="#tutorial">An Example Using the LLVM Tool Chain</a>
       <li><a href="#problems">Common Problems</a>
@@ -247,7 +249,8 @@
             <ol>
                 <li><tt>cd <i>where-you-want-llvm-to-live</i></tt>
                 <li><tt>gunzip --stdout llvm.tar.gz | tar -xvf -</tt>
-                <li><tt>gunzip --stdout cfrontend.<i>platform</i>.tar.gz | tar -xvf -</tt>
+                <li><tt>gunzip --stdout cfrontend.<i>platform</i>.tar.gz | tar
+                -xvf -</tt>
                 <li><tt>cd llvm</tt>
             </ol>
 
@@ -255,7 +258,8 @@
 
             <li>With anonymous CVS access:
             <ol>
-                <li>Find the path to the CVS repository containing LLVM (we'll call this <i>CVSROOTDIR</i>).
+                <li>Find the path to the CVS repository containing LLVM (we'll
+                call this <i>CVSROOTDIR</i>).
                 <li><tt>cd <i>where-you-want-llvm-to-live</i></tt>
                 <li><tt>cvs -d <i>CVSROOTDIR</i> checkout llvm</tt>
                 <li><tt>cd llvm</tt>
@@ -273,7 +277,8 @@
                 <ul>
                     <li><tt>--with-objroot=<i>directory</i></tt>
                     <br>
-                    Specify where object files should be placed during the build.
+                    Specify where object files should be placed during the
+                    build.
 
                     <li><tt>--with-llvmgccdir=<i>directory</i></tt>
                     <br>
@@ -870,6 +875,72 @@
       primarily useful for debugging analyses, or familiarizing yourself with
       what an analysis does.<p>
 
+    </dl>
+
+    <!------------------------------------------------------------------------->
+    <h3><a name="utils"><tt>llvm/utils</tt></a></h3>
+    <!------------------------------------------------------------------------->
+
+    This directory contains utilities for working with LLVM sourcecode, and some
+    of the utilities are actually required as part of the build process because
+    they are code generators for parts of LLVM infrastructure.
+
+    <dl compact>
+      <td><tt><b>Burg</b></tt><dd> <tt>Burg</tt> is an instruction selector
+      generator -- it builds trees on which it then performs pattern-matching to
+      select instructions according to the patterns the user has specified. Burg
+      is currently used in the Sparc V9 backend.<p>
+
+      <dt><tt><b>codegen-diff</b></tt><dd> <tt>codegen-diff</tt> is a script
+      that finds differences between code that LLC generates and code that LLI
+      generates. This is a useful tool if you are debugging one of them,
+      assuming that the other generates correct output. For the full user
+      manual, run <tt>`perldoc codegen-diff'</tt>.<p>
+
+      <dt><tt><b>cvsupdate</b></tt><dd> <tt>cvsupdate</tt> is a script that will
+      update your CVS tree, but produce a much cleaner and more organized output
+      than simply running <tt>`cvs up -dP'</tt> will. For example, it will group
+      together all the new and updated files and modified files in separate
+      sections, so you can see at a glance what has changed. If you are at the
+      top of your LLVM CVS tree, running <tt>utils/cvsupdate</tt> is the
+      preferred way of updating the tree.<p>
+
+      <dt><tt><b>emacs</b></tt><dd> The <tt>emacs</tt> directory contains
+      syntax-highlighting files which will work with Emacs and XEmacs editors,
+      providing syntax highlighting support for LLVM assembly files and TableGen
+      description files.<p>
+
+      <dt><tt><b>getsrcs.sh</b></tt><dd> The <tt>getsrcs.sh</tt> script finds
+      and outputs all non-generated source files, which is useful if one wishes
+      to do a lot of development across directories and does not want to
+      individually find each file. One way to use it is to run, for example:
+      <tt>xemacs `utils/getsources.sh`</tt> from the top of your LLVM source
+      tree.<p>
+      
+      <dt><tt><b>makellvm</b></tt><dd> The <tt>makellvm</tt> script compiles all
+      files in the current directory and then compiles and links the tool that
+      is the first argument. For example, assuming you are in the directory
+      <tt>llvm/lib/Target/Sparc</tt>, if <tt>makellvm</tt> is in your path,
+      simply running <tt>makellvm llc</tt> will make a build of the current
+      directory, switch to directory <tt>llvm/tools/llc</tt> and build it,
+      causing a re-linking of LLC.<p>
+
+      <dt><tt><b>NightlyTest.pl</b></tt> and
+      <tt><b>NightlyTestTemplate.html</b></tt><dd> These files are used in a
+      cron script to generate nightly status reports of the functionality of
+      tools, and the results can be seen by following the appropriate link on
+      the <a href="http://llvm.cs.uiuc.edu/">LLVM homepage</a>.<p>
+
+      <dt><tt><b>TableGen</b></tt><dd> The <tt>TableGen</tt> directory contains
+      the tool used to generate register descriptions, instruction set
+      descriptins, and even assemblers from common TableGen description
+      files.<p>
+
+      <dt><tt><b>vim</b></tt><dd> The <tt>vim</tt> directory contains
+      syntax-highlighting files which will work with the VIM editor, providing
+      syntax highlighting support for LLVM assembly files and TableGen
+      description files.<p>
+ 
     </dl>
 
     <!--=====================================================================-->




From lattner at cs.uiuc.edu  Mon Aug 11 13:54:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 13:54:02 2003
Subject: [llvm-commits] CVS: llvm/www/docs/GettingStarted.html
Message-ID: <200308111853.NAA25011@tank.cs.uiuc.edu>


Changes in directory llvm/www/docs:

GettingStarted.html updated: 1.30 -> 1.31

---
Log message:

Geez, this misha guy is a _horrible_ speller.  :)


---
Diffs of the changes:

Index: llvm/www/docs/GettingStarted.html
diff -u llvm/www/docs/GettingStarted.html:1.30 llvm/www/docs/GettingStarted.html:1.31
--- llvm/www/docs/GettingStarted.html:1.30	Mon Aug 11 13:45:46 2003
+++ llvm/www/docs/GettingStarted.html	Mon Aug 11 13:53:14 2003
@@ -933,7 +933,7 @@
 
       <dt><tt><b>TableGen</b></tt><dd> The <tt>TableGen</tt> directory contains
       the tool used to generate register descriptions, instruction set
-      descriptins, and even assemblers from common TableGen description
+      descriptions, and even assemblers from common TableGen description
       files.<p>
 
       <dt><tt><b>vim</b></tt><dd> The <tt>vim</tt> directory contains
@@ -1145,7 +1145,7 @@
 
 	    <!-- Created: Mon Jul  1 02:29:02 CDT 2002 -->
 	    <!-- hhmts start -->
-Last modified: Tue Jun  3 22:06:43 CDT 2003
+Last modified: Mon Aug 11 13:52:22 CDT 2003
 <!-- hhmts end -->
   </body>
 </html>




From gaeke at niobe.cs.uiuc.edu  Mon Aug 11 14:06:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Mon Aug 11 14:06:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Printer.cpp
Message-ID: <200308111905.h7BJ5vF08312@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Printer.cpp updated: 1.54 -> 1.55

---
Log message:

Print % signs before register names; turn off "noprefix" mode in gas output.
Fixes test case test/Programs/LLVMSource/2003-08-03-ReservedWordGlobal.ll.

Also: Refactor implicit-uses printing into its own method.
Remove a couple of unused variables.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/Printer.cpp
diff -u llvm/lib/Target/X86/Printer.cpp:1.54 llvm/lib/Target/X86/Printer.cpp:1.55
--- llvm/lib/Target/X86/Printer.cpp:1.54	Sun Aug  3 20:04:59 2003
+++ llvm/lib/Target/X86/Printer.cpp	Mon Aug 11 14:05:46 2003
@@ -55,6 +55,7 @@
       return "X86 Assembly Printer";
     }
 
+    void checkImplUses (const TargetInstrDescriptor &Desc);
     void printMachineInstruction(const MachineInstr *MI);
     void printOp(const MachineOperand &MO,
 		 bool elideOffsetKeyword = false);
@@ -441,6 +442,8 @@
     MI->getOperand(Op+2).isRegister() &&MI->getOperand(Op+3).isImmediate();
 }
 
+
+
 void Printer::printOp(const MachineOperand &MO,
 		      bool elideOffsetKeyword /* = false */) {
   const MRegisterInfo &RI = *TM.getRegisterInfo();
@@ -453,7 +456,8 @@
     // FALLTHROUGH
   case MachineOperand::MO_MachineRegister:
     if (MO.getReg() < MRegisterInfo::FirstVirtualRegister)
-      O << RI.get(MO.getReg()).Name;
+      // Bug Workaround: See note in Printer::doInitialization about %.
+      O << "%" << RI.get(MO.getReg()).Name;
     else
       O << "%reg" << MO.getReg();
     return;
@@ -497,7 +501,6 @@
 }
 
 void Printer::printMemReference(const MachineInstr *MI, unsigned Op) {
-  const MRegisterInfo &RI = *TM.getRegisterInfo();
   assert(isMem(MI, Op) && "Invalid memory reference!");
 
   if (MI->getOperand(Op).isFrameIndex()) {
@@ -548,6 +551,19 @@
   O << "]";
 }
 
+/// checkImplUses - Emit the implicit-use registers for the
+/// instruction described by DESC, if its PrintImplUses flag is set.
+///
+void Printer::checkImplUses (const TargetInstrDescriptor &Desc) {
+  const MRegisterInfo &RI = *TM.getRegisterInfo();
+  if (Desc.TSFlags & X86II::PrintImplUses) {
+    for (const unsigned *p = Desc.ImplicitUses; *p; ++p) {
+      // Bug Workaround: See note in Printer::doInitialization about %.
+      O << ", %" << RI.get(*p).Name;
+    }
+  }
+}
+
 /// printMachineInstruction -- Print out a single X86 LLVM instruction
 /// MI in Intel syntax to the current output stream.
 ///
@@ -555,7 +571,6 @@
   unsigned Opcode = MI->getOpcode();
   const TargetInstrInfo &TII = TM.getInstrInfo();
   const TargetInstrDescriptor &Desc = TII.get(Opcode);
-  const MRegisterInfo &RI = *TM.getRegisterInfo();
 
   switch (Desc.TSFlags & X86II::FormMask) {
   case X86II::Pseudo:
@@ -647,11 +662,7 @@
       O << ", ";
       printOp(MI->getOperand(1));
     }
-    if (Desc.TSFlags & X86II::PrintImplUses) {
-      for (const unsigned *p = Desc.ImplicitUses; *p; ++p) {
-	O << ", " << RI.get(*p).Name;
-      }
-    }
+    checkImplUses(Desc);
     O << "\n";
     return;
   }
@@ -782,11 +793,7 @@
       O << ", ";
       printOp(MI->getOperand(MI->getNumOperands()-1));
     }
-    if (Desc.TSFlags & X86II::PrintImplUses) {
-      for (const unsigned *p = Desc.ImplicitUses; *p; ++p) {
-	O << ", " << RI.get(*p).Name;
-      }
-    }
+    checkImplUses(Desc);
     O << "\n";
 
     return;
@@ -898,9 +905,17 @@
 
 bool Printer::doInitialization(Module &M)
 {
-  // Tell gas we are outputting Intel syntax (not AT&T syntax) assembly,
-  // with no % decorations on register names.
-  O << "\t.intel_syntax noprefix\n";
+  // Tell gas we are outputting Intel syntax (not AT&T syntax)
+  // assembly.
+  //
+  // Bug: gas in `intel_syntax noprefix' mode interprets the symbol
+  // `Sp' in an instruction as a reference to the register named sp,
+  // and if you try to reference a symbol `Sp' (e.g. `mov ECX, OFFSET
+  // Sp') then it gets lowercased before being looked up in the symbol
+  // table. This creates spurious `undefined symbol' errors when
+  // linking. Workaround: Do not use `noprefix' mode, and decorate all
+  // register names with percent signs.
+  O << "\t.intel_syntax\n";
   Mang = new Mangler(M);
   return false; // success
 }




From gaeke at cs.uiuc.edu  Mon Aug 11 14:09:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Aug 11 14:09:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp
Message-ID: <200308111908.OAA26283@trinity.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

SecondTrigger.cpp updated: 1.11 -> 1.12

---
Log message:

Let constructVBB fail silently (by returning an empty vector) if it
 finds a return instruction, instead of crashing.
Only call optimizeTrace on a non-empty vector.
This should let us start testing the traceToFunction pass.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.11 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.12
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.11	Fri Aug  8 14:33:50 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp	Mon Aug 11 14:08:46 2003
@@ -506,6 +506,12 @@
     TerminatorInst *TI = bb->getTerminator();
     BranchInst *BI = dyn_cast<BranchInst>(TI);
     if (!BI) {
+      if (ReturnInst *RI = dyn_cast<ReturnInst> (TI)) {
+	// Silently fail if we have a basic block in the trace that
+	// ends in a return.
+	vBB.clear();
+	return;
+      }
       std::cerr << "Offending instruction: " << *TI << "\n";
       assert(0 && "Terminator instruction of BB must be a branch");
     }
@@ -556,8 +562,8 @@
 
   //use path 0 to form vBB
   //vector<BasicBlock *> vBB;
-  //constructVBB (path, start, vBB);
-  //optimizeTrace (vBB, firstLevelTraceStartAddr);
+  //constructVBB (paths[0], start, vBB);
+  //if (!vBB.empty()) { optimizeTrace (vBB, firstLevelTraceStartAddr); }
   //return;
   
 #ifdef GET_ALL_INFO




From brukman at cs.uiuc.edu  Mon Aug 11 14:11:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 14:11:02 2003
Subject: [llvm-commits] CVS: llvm/utils/emacs/README tablegen-mode.el llvm-mode.el
Message-ID: <200308111910.OAA07729@zion.cs.uiuc.edu>


Changes in directory llvm/utils/emacs:

README added (r1.1)
tablegen-mode.el added (r1.1)
llvm-mode.el updated: 1.6 -> 1.7

---
Log message:

* Added (X)Emacs mode for TableGen description files
* Added README that describes how to use the mode files
* Associated files with .llx extension with llvm-mode


---
Diffs of the changes:

Index: llvm/utils/emacs/README
diff -c /dev/null llvm/utils/emacs/README:1.1
*** /dev/null	Mon Aug 11 14:10:12 2003
--- llvm/utils/emacs/README	Mon Aug 11 14:10:02 2003
***************
*** 0 ****
--- 1,27 ----
+ -*- llvm/utils/emacs/README -*-
+ 
+ These are syntax highlighting files for the Emacs and XEmacs editors. Included
+ are:
+ 
+ * llvm-mode.el
+ 
+   Syntax highlighting mode for LLVM assembly files. To use, add this code to
+   your ~/.emacs :
+ 
+   (setq load-path
+     (cons (expand-file-name "path-to-llvm/utils/emacs") load-path))
+   (require 'llvm-mode)
+   
+ * tablegen-mode.el
+ 
+   Syntax highlighting mode for TableGen description files. To use, add this code
+   to your ~/.emacs:
+ 
+   (setq load-path
+     (cons (expand-file-name "path-to-llvm/utils/emacs") load-path))
+   (require 'tablegen-mode)
+ 
+ 
+ Note: If you notice missing or incorrect syntax highlighting, please contact
+ <llvmbugs [at] cs.uiuc.edu>; if you wish to provide a patch to improve the
+ functionality, it will be most appreciated. Thank you.


Index: llvm/utils/emacs/tablegen-mode.el
diff -c /dev/null llvm/utils/emacs/tablegen-mode.el:1.1
*** /dev/null	Mon Aug 11 14:10:12 2003
--- llvm/utils/emacs/tablegen-mode.el	Mon Aug 11 14:10:02 2003
***************
*** 0 ****
--- 1,114 ----
+ ;; Maintainer:  The LLVM team, http://llvm.cs.uiuc.edu/
+ ;; Description: Major mode for TableGen description files (part of LLVM project)
+ ;; Updated:     2003-08-11
+ 
+ ;; Create mode-specific tables.
+ (defvar tablegen-mode-syntax-table nil
+   "Syntax table used while in TableGen mode.")
+ 
+ (defvar tablegen-font-lock-keywords
+   (list
+    ;; Comments
+    '("\/\/.*" . font-lock-comment-face)
+    ;; Strings
+    '("\"[^\"]+\"" . font-lock-string-face)
+    ;; Hex constants
+    '("0x[0-9A-Fa-f]+" . font-lock-preprocessor-face)
+    ;; Binary constants
+    '("0b[01]+" . font-lock-preprocessor-face)
+    ;; Integer literals
+    '("[-]?[0-9]+" . font-lock-preprocessor-face)
+    ;; Floating point constants
+    '("[-+]?[0-9]+\.[0-9]*\([eE][-+]?[0-9]+\)?" . font-lock-preprocessor-face)
+    ;; Keywords
+    '("include\\|def\\|let\\|in\\|code\\|dag\\|field" . font-lock-keyword-face)
+    ;; Types
+    '("class\\|int\\|string\\|list\\|bits?" . font-lock-type-face)
+    )
+   "Syntax highlighting for TableGen"
+   )
+ 
+ ;; ---------------------- Syntax table ---------------------------
+ ;; Shamelessly ripped from jasmin.el
+ ;; URL: http://www.neilvandyke.org/jasmin-emacs/jasmin.el.html
+ 
+ (if (not tablegen-mode-syntax-table)
+     (progn
+       (setq tablegen-mode-syntax-table (make-syntax-table))
+       (mapcar (function (lambda (n)
+                           (modify-syntax-entry (aref n 0)
+                                                (aref n 1)
+                                                tablegen-mode-syntax-table)))
+               '(
+                 ;; whitespace (` ')
+                 [?\^m " "]
+                 [?\f  " "]
+                 [?\n  " "]
+                 [?\t  " "]
+                 [?\   " "]
+                 ;; word constituents (`w')
+                 ;;[?<  "w"]
+                 ;;[?>  "w"]
+                 [?\%  "w"]
+                 ;;[?_  "w  "]
+                 ;; comments
+                 [?\;  "< "]
+                 [?\n  "> "]
+                 ;;[?\r  "> "]
+                 ;;[?\^m "> "]
+                 ;; symbol constituents (`_')
+                 ;; punctuation (`.')
+                 ;; open paren (`(')
+                 [?\( "("]
+                 [?\[ "("]
+                 [?\{ "("]
+                 ;; close paren (`)')
+                 [?\) ")"]
+                 [?\] ")"]
+                 [?\} ")"]
+                 ;; string quote ('"')
+                 [?\" "\""]
+                 ))))
+ 
+ ;; --------------------- Abbrev table -----------------------------
+ 
+ (defvar tablegen-mode-abbrev-table nil
+   "Abbrev table used while in TableGen mode.")
+ (define-abbrev-table 'tablegen-mode-abbrev-table ())
+ 
+ (defvar tablegen-mode-hook nil)
+ (defvar tablegen-mode-map nil)   ; Create a mode-specific keymap.
+ 
+ (if (not tablegen-mode-map)
+     ()  ; Do not change the keymap if it is already set up.
+   (setq tablegen-mode-map (make-sparse-keymap))
+   (define-key tablegen-mode-map "\t" 'tab-to-tab-stop)
+   (define-key tablegen-mode-map "\es" 'center-line)
+   (define-key tablegen-mode-map "\eS" 'center-paragraph))
+ 
+ 
+ (defun tablegen-mode ()
+   "Major mode for editing TableGen description files.
+   \\{tablegen-mode-map}
+   Runs tablegen-mode-hook on startup."
+   (interactive)
+   (kill-all-local-variables)
+   (use-local-map tablegen-mode-map)         ; Provides the local keymap.
+   (setq major-mode 'tablegen-mode)          
+ 
+   (make-local-variable	'font-lock-defaults)
+   (setq major-mode 'tablegen-mode           ; This is how describe-mode
+                                             ;   finds the doc string to print.
+ 	mode-name "TableGen"                      ; This name goes into the modeline.
+ 	font-lock-defaults `(tablegen-font-lock-keywords))
+ 
+   (setq local-abbrev-table tablegen-mode-abbrev-table)
+   (set-syntax-table tablegen-mode-syntax-table)
+   (run-hooks 'tablegen-mode-hook))          ; Finally, this permits the user to
+                                             ;   customize the mode with a hook.
+ 
+ ;; Associate .td files with tablegen-mode
+ (setq auto-mode-alist (append '(("\\.td$" . tablegen-mode)) auto-mode-alist))
+ 
+ (provide 'tablegen-mode)
+ ;; end of tablegen-mode.el


Index: llvm/utils/emacs/llvm-mode.el
diff -u llvm/utils/emacs/llvm-mode.el:1.6 llvm/utils/emacs/llvm-mode.el:1.7
--- llvm/utils/emacs/llvm-mode.el:1.6	Mon Jun  2 19:59:24 2003
+++ llvm/utils/emacs/llvm-mode.el	Mon Aug 11 14:10:02 2003
@@ -121,7 +121,7 @@
 
 ;; Associate .ll files with llvm-mode
 (setq auto-mode-alist
-      (append '(("\\.ll$" . llvm-mode)) auto-mode-alist))
+   (append '(("\\.ll$" . llvm-mode) ("\\.llx$" . llvm-mode)) auto-mode-alist))
 
 (provide 'llvm-mode)
 ;; end of llvm-mode.el




From brukman at cs.uiuc.edu  Mon Aug 11 14:14:01 2003
From: brukman at cs.uiuc.edu (Michael Brukman)
Date: Mon Aug 11 14:14:01 2003
Subject: [llvm-commits] CVS: llvm/www/docs/GettingStarted.html
Message-ID: <200308111913.OAA25166@tank.cs.uiuc.edu>


Changes in directory llvm/www/docs:

GettingStarted.html updated: 1.31 -> 1.32

---
Log message:

* Added pointers to the README files in emacs/ and vim/ directories.
* Added slashes to distinguish directories and tools from simple scripts.


---
Diffs of the changes:

Index: llvm/www/docs/GettingStarted.html
diff -u llvm/www/docs/GettingStarted.html:1.31 llvm/www/docs/GettingStarted.html:1.32
--- llvm/www/docs/GettingStarted.html:1.31	Mon Aug 11 13:53:14 2003
+++ llvm/www/docs/GettingStarted.html	Mon Aug 11 14:13:12 2003
@@ -886,7 +886,7 @@
     they are code generators for parts of LLVM infrastructure.
 
     <dl compact>
-      <td><tt><b>Burg</b></tt><dd> <tt>Burg</tt> is an instruction selector
+      <td><tt><b>Burg/</b></tt><dd> <tt>Burg</tt> is an instruction selector
       generator -- it builds trees on which it then performs pattern-matching to
       select instructions according to the patterns the user has specified. Burg
       is currently used in the Sparc V9 backend.<p>
@@ -905,10 +905,11 @@
       top of your LLVM CVS tree, running <tt>utils/cvsupdate</tt> is the
       preferred way of updating the tree.<p>
 
-      <dt><tt><b>emacs</b></tt><dd> The <tt>emacs</tt> directory contains
+      <dt><tt><b>emacs/</b></tt><dd> The <tt>emacs</tt> directory contains
       syntax-highlighting files which will work with Emacs and XEmacs editors,
       providing syntax highlighting support for LLVM assembly files and TableGen
-      description files.<p>
+      description files. For information on how to use the syntax files, consult
+      the <tt>README</tt> file in that directory.<p>
 
       <dt><tt><b>getsrcs.sh</b></tt><dd> The <tt>getsrcs.sh</tt> script finds
       and outputs all non-generated source files, which is useful if one wishes
@@ -931,15 +932,16 @@
       tools, and the results can be seen by following the appropriate link on
       the <a href="http://llvm.cs.uiuc.edu/">LLVM homepage</a>.<p>
 
-      <dt><tt><b>TableGen</b></tt><dd> The <tt>TableGen</tt> directory contains
+      <dt><tt><b>TableGen/</b></tt><dd> The <tt>TableGen</tt> directory contains
       the tool used to generate register descriptions, instruction set
       descriptions, and even assemblers from common TableGen description
       files.<p>
 
-      <dt><tt><b>vim</b></tt><dd> The <tt>vim</tt> directory contains
+      <dt><tt><b>vim/</b></tt><dd> The <tt>vim</tt> directory contains
       syntax-highlighting files which will work with the VIM editor, providing
       syntax highlighting support for LLVM assembly files and TableGen
-      description files.<p>
+      description files. For information on how to use the syntax files, consult
+      the <tt>README</tt> file in that directory.<p>
  
     </dl>
 




From brukman at cs.uiuc.edu  Mon Aug 11 14:15:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 14:15:02 2003
Subject: [llvm-commits] CVS: llvm/utils/vim/tablegen.vim
Message-ID: <200308111914.OAA07807@zion.cs.uiuc.edu>


Changes in directory llvm/utils/vim:

tablegen.vim updated: 1.2 -> 1.3

---
Log message:

Added keyword `include', and a FIXME for hex and binary constants.


---
Diffs of the changes:

Index: llvm/utils/vim/tablegen.vim
diff -u llvm/utils/vim/tablegen.vim:1.2 llvm/utils/vim/tablegen.vim:1.3
--- llvm/utils/vim/tablegen.vim:1.2	Mon Aug 11 13:05:19 2003
+++ llvm/utils/vim/tablegen.vim	Mon Aug 11 14:14:20 2003
@@ -11,8 +11,9 @@
 
 syn case match
 
-syn keyword tgKeyword   def let in code dag field
+syn keyword tgKeyword   def let in code dag field include
 syn keyword tgType      class int string list bit bits 
+" FIXME: this does not handle hex (0x...) or binary (0b...) constants
 syn match   tgNumber    /\<\d\+\>/
 syn match   tgNumber    /\<\d\+\.\d*\>/
 syn match   tgComment   /\/\/.*$/




From lattner at cs.uiuc.edu  Mon Aug 11 14:35:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 14:35:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Support/Mangler.cpp
Message-ID: <200308111934.OAA31691@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

Mangler.cpp updated: 1.3 -> 1.4

---
Log message:

Add support to the mangler for targets which require _'s on global symbols



---
Diffs of the changes:

Index: llvm/lib/Support/Mangler.cpp
diff -u llvm/lib/Support/Mangler.cpp:1.3 llvm/lib/Support/Mangler.cpp:1.4
--- llvm/lib/Support/Mangler.cpp:1.3	Fri Jul 25 15:21:20 2003
+++ llvm/lib/Support/Mangler.cpp	Mon Aug 11 14:34:29 2003
@@ -42,8 +42,9 @@
     //   2) V's name would collide if it is not mangled.
     //
     const GlobalValue* gv = dyn_cast<GlobalValue>(V);
-    if(gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
+    if (gv && !gv->hasInternalLinkage() && !MangledGlobals.count(gv)) {
       name = makeNameProper(gv->getName());
+      if (AddUnderscorePrefix) name = "_" + name;
     } else {
       // Non-global, or global with internal linkage / colliding name
       // -> mangle.
@@ -54,12 +55,13 @@
     name = "ltmp_" + utostr(Count++) + "_"
       + utostr(V->getType()->getUniqueID());
   }
+  
   Memo[V] = name;
   return name;
 }
 
-Mangler::Mangler(Module &M_) : M(M_)
-{
+Mangler::Mangler(Module &m, bool addUnderscorePrefix)
+  : M(m), AddUnderscorePrefix(addUnderscorePrefix) {
   // Calculate which global values have names that will collide when we throw
   // away type information.
   std::set<std::string> FoundNames;




From lattner at cs.uiuc.edu  Mon Aug 11 14:35:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 14:35:03 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/Mangler.h
Message-ID: <200308111934.OAA31684@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Support:

Mangler.h updated: 1.4 -> 1.5

---
Log message:

Add support to the mangler for targets which require _'s on global symbols


---
Diffs of the changes:

Index: llvm/include/llvm/Support/Mangler.h
diff -u llvm/include/llvm/Support/Mangler.h:1.4 llvm/include/llvm/Support/Mangler.h:1.5
--- llvm/include/llvm/Support/Mangler.h:1.4	Mon Jul 28 11:42:33 2003
+++ llvm/include/llvm/Support/Mangler.h	Mon Aug 11 14:34:27 2003
@@ -14,14 +14,29 @@
 #include <string>
 
 class Mangler {
+  /// This keeps track of which global values have had their names
+  /// mangled in the current module.
+  ///
+  std::set<const Value *> MangledGlobals;
+
+  Module &M;
+  bool AddUnderscorePrefix;
+
+  typedef std::map<const Value *, std::string> ValueMap;
+  ValueMap Memo;
+
+  unsigned Count;
 public:
+
+  // Mangler ctor - if AddUnderscorePrefix is true, then all public global
+  // symbols will be prefixed with an underscore.
+  Mangler(Module &M, bool AddUnderscorePrefix = false);
+
   /// getValueName - Returns the mangled name of V, an LLVM Value,
   /// in the current module.
   ///
   std::string getValueName(const Value *V);
 
-  Mangler(Module &M_);
-
   /// makeNameProper - We don't want identifier names with ., space, or
   /// - in them, so we mangle these characters into the strings "d_",
   /// "s_", and "D_", respectively. This is a very simple mangling that
@@ -30,19 +45,6 @@
   /// from getValueName.
   /// 
   static std::string makeNameProper(const std::string &x);
-
-private:
-  /// This keeps track of which global values have had their names
-  /// mangled in the current module.
-  ///
-  std::set<const Value *> MangledGlobals;
-
-  Module &M;
-
-  typedef std::map<const Value *, std::string> ValueMap;
-  ValueMap Memo;
-
-  unsigned int Count;
 };
 
 #endif // LLVM_SUPPORT_MANGLER_H




From lattner at cs.uiuc.edu  Mon Aug 11 14:36:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 14:36:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Makefile
Message-ID: <200308111935.OAA31728@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Makefile updated: 1.7 -> 1.8

---
Log message:

Whoops, accidental checkin.  :(


---
Diffs of the changes:

Index: llvm/lib/Target/X86/Makefile
diff -u llvm/lib/Target/X86/Makefile:1.7 llvm/lib/Target/X86/Makefile:1.8
--- llvm/lib/Target/X86/Makefile:1.7	Mon Aug 11 14:35:26 2003
+++ llvm/lib/Target/X86/Makefile	Mon Aug 11 14:35:46 2003
@@ -23,7 +23,7 @@
 	$(TBLGEN) $< -gen-instr-desc -o $@
 
 X86GenInstrSelector.inc: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -debug -gen-instr-selector -o $@
+	$(TBLGEN) $< -gen-instr-selector -o $@
 
 clean::
 	$(VERB) rm -f *.inc




From lattner at cs.uiuc.edu  Mon Aug 11 14:36:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 14:36:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Makefile Printer.cpp
Message-ID: <200308111935.OAA31711@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Makefile updated: 1.6 -> 1.7
Printer.cpp updated: 1.55 -> 1.56

---
Log message:

Add a new -enable-cygwin-compatible-output argument, which make the output more
consumably by the cygwin assembler.  This is really just a nasty hack until we
get real target triple support.



---
Diffs of the changes:

Index: llvm/lib/Target/X86/Makefile
diff -u llvm/lib/Target/X86/Makefile:1.6 llvm/lib/Target/X86/Makefile:1.7
--- llvm/lib/Target/X86/Makefile:1.6	Mon Aug 11 10:30:20 2003
+++ llvm/lib/Target/X86/Makefile	Mon Aug 11 14:35:26 2003
@@ -23,7 +23,7 @@
 	$(TBLGEN) $< -gen-instr-desc -o $@
 
 X86GenInstrSelector.inc: X86.td X86InstrInfo.td ../Target.td $(TBLGEN)
-	$(TBLGEN) $< -gen-instr-selector -o $@
+	$(TBLGEN) $< -debug -gen-instr-selector -o $@
 
 clean::
 	$(VERB) rm -f *.inc


Index: llvm/lib/Target/X86/Printer.cpp
diff -u llvm/lib/Target/X86/Printer.cpp:1.55 llvm/lib/Target/X86/Printer.cpp:1.56
--- llvm/lib/Target/X86/Printer.cpp:1.55	Mon Aug 11 14:05:46 2003
+++ llvm/lib/Target/X86/Printer.cpp	Mon Aug 11 14:35:26 2003
@@ -3,7 +3,7 @@
 // This file contains a printer that converts from our internal
 // representation of machine-dependent LLVM code to Intel-format
 // assembly language. This printer is the output mechanism used
-// by `llc' and `lli -printmachineinstrs' on X86.
+// by `llc' and `lli -print-machineinstrs' on X86.
 //
 //===----------------------------------------------------------------------===//
 
@@ -20,8 +20,14 @@
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Support/Mangler.h"
 #include "Support/StringExtras.h"
+#include "Support/CommandLine.h"
 
 namespace {
+  // FIXME: This should be automatically picked up by autoconf from the C
+  // frontend
+  cl::opt<bool> EmitCygwin("enable-cygwin-compatible-output", cl::Hidden,
+         cl::desc("Emit X86 assembly code suitable for consumption by cygwin"));
+
   struct Printer : public MachineFunctionPass {
     /// Output stream on which we're printing assembly code.
     ///
@@ -399,7 +405,8 @@
   O << "\t.text\n";
   O << "\t.align 16\n";
   O << "\t.globl\t" << CurrentFnName << "\n";
-  O << "\t.type\t" << CurrentFnName << ", @function\n";
+  if (!EmitCygwin)
+    O << "\t.type\t" << CurrentFnName << ", @function\n";
   O << CurrentFnName << ":\n";
 
   // Number each basic block so that we can consistently refer to them
@@ -455,10 +462,11 @@
     }
     // FALLTHROUGH
   case MachineOperand::MO_MachineRegister:
-    if (MO.getReg() < MRegisterInfo::FirstVirtualRegister)
+    if (MO.getReg() < MRegisterInfo::FirstVirtualRegister) {
       // Bug Workaround: See note in Printer::doInitialization about %.
-      O << "%" << RI.get(MO.getReg()).Name;
-    else
+      if (!EmitCygwin) O << "%";
+      O << RI.get(MO.getReg()).Name;
+    } else
       O << "%reg" << MO.getReg();
     return;
 
@@ -559,7 +567,7 @@
   if (Desc.TSFlags & X86II::PrintImplUses) {
     for (const unsigned *p = Desc.ImplicitUses; *p; ++p) {
       // Bug Workaround: See note in Printer::doInitialization about %.
-      O << ", %" << RI.get(*p).Name;
+      O << ", " << (EmitCygwin ? "" : "%") << RI.get(*p).Name;
     }
   }
 }
@@ -903,20 +911,22 @@
   }
 }
 
-bool Printer::doInitialization(Module &M)
-{
-  // Tell gas we are outputting Intel syntax (not AT&T syntax)
-  // assembly.
+bool Printer::doInitialization(Module &M) {
+  // Tell gas we are outputting Intel syntax (not AT&T syntax) assembly.
+  //
+  // Bug: gas in `intel_syntax noprefix' mode interprets the symbol `Sp' in an
+  // instruction as a reference to the register named sp, and if you try to
+  // reference a symbol `Sp' (e.g. `mov ECX, OFFSET Sp') then it gets lowercased
+  // before being looked up in the symbol table. This creates spurious
+  // `undefined symbol' errors when linking. Workaround: Do not use `noprefix'
+  // mode, and decorate all register names with percent signs.
+  //
+  // Cygwin presumably doesn't have this problem, so drop the %'s.
   //
-  // Bug: gas in `intel_syntax noprefix' mode interprets the symbol
-  // `Sp' in an instruction as a reference to the register named sp,
-  // and if you try to reference a symbol `Sp' (e.g. `mov ECX, OFFSET
-  // Sp') then it gets lowercased before being looked up in the symbol
-  // table. This creates spurious `undefined symbol' errors when
-  // linking. Workaround: Do not use `noprefix' mode, and decorate all
-  // register names with percent signs.
-  O << "\t.intel_syntax\n";
-  Mang = new Mangler(M);
+  O << "\t.intel_syntax";
+  if (EmitCygwin) O << " noprefix";
+  O << "\n";
+  Mang = new Mangler(M, EmitCygwin);
   return false; // success
 }
 




From gaeke at cs.uiuc.edu  Mon Aug 11 15:06:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Aug 11 15:06:01 2003
Subject: [llvm-commits] CVS: llvm/include/Support/DataTypes.h
Message-ID: <200308112005.PAA31167@neo.cs.uiuc.edu>


Changes in directory llvm/include/Support:

DataTypes.h updated: 1.12 -> 1.13

---
Log message:

If we can't find INT64_MAX, set it to a reasonable default value,
instead of printing out an (incorrect) #error message.


---
Diffs of the changes:

Index: llvm/include/Support/DataTypes.h
diff -u llvm/include/Support/DataTypes.h:1.12 llvm/include/Support/DataTypes.h:1.13
--- llvm/include/Support/DataTypes.h:1.12	Mon Jun 30 16:58:23 2003
+++ llvm/include/Support/DataTypes.h	Mon Aug 11 15:04:57 2003
@@ -32,8 +32,16 @@
 #error "Cannot define both ENDIAN_LITTLE and ENDIAN_BIG!"
 #endif
 
-#if (!defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG)) || !defined(INT64_MAX)
+#if (!defined(ENDIAN_LITTLE) && !defined(ENDIAN_BIG))
 #error "include/Support/DataTypes.h could not determine endianness!"
+#endif
+
+#if !defined(INT64_MAX)
+/* We couldn't determine INT64_MAX; default it. */
+#define INT64_MAX 9223372036854775807LL
+#endif
+#if !defined(UINT64_MAX)
+#define UINT64_MAX 0xffffffffffffffffULL
 #endif
 
 #endif  /* SUPPORT_DATATYPES_H */




From lattner at cs.uiuc.edu  Mon Aug 11 15:06:05 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 15:06:05 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Printer.cpp
Message-ID: <200308112005.PAA32198@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Printer.cpp updated: 1.56 -> 1.57

---
Log message:

Cygwin apparently works with %'s on registers!


---
Diffs of the changes:

Index: llvm/lib/Target/X86/Printer.cpp
diff -u llvm/lib/Target/X86/Printer.cpp:1.56 llvm/lib/Target/X86/Printer.cpp:1.57
--- llvm/lib/Target/X86/Printer.cpp:1.56	Mon Aug 11 14:35:26 2003
+++ llvm/lib/Target/X86/Printer.cpp	Mon Aug 11 15:04:57 2003
@@ -464,7 +464,6 @@
   case MachineOperand::MO_MachineRegister:
     if (MO.getReg() < MRegisterInfo::FirstVirtualRegister) {
       // Bug Workaround: See note in Printer::doInitialization about %.
-      if (!EmitCygwin) O << "%";
       O << RI.get(MO.getReg()).Name;
     } else
       O << "%reg" << MO.getReg();
@@ -567,7 +566,7 @@
   if (Desc.TSFlags & X86II::PrintImplUses) {
     for (const unsigned *p = Desc.ImplicitUses; *p; ++p) {
       // Bug Workaround: See note in Printer::doInitialization about %.
-      O << ", " << (EmitCygwin ? "" : "%") << RI.get(*p).Name;
+      O << ", %" << RI.get(*p).Name;
     }
   }
 }
@@ -923,9 +922,7 @@
   //
   // Cygwin presumably doesn't have this problem, so drop the %'s.
   //
-  O << "\t.intel_syntax";
-  if (EmitCygwin) O << " noprefix";
-  O << "\n";
+  O << "\t.intel_syntax\n";
   Mang = new Mangler(M, EmitCygwin);
   return false; // success
 }




From lattner at cs.uiuc.edu  Mon Aug 11 15:07:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 15:07:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Printer.cpp
Message-ID: <200308112006.PAA32393@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Printer.cpp updated: 1.57 -> 1.58

---
Log message:

Sort #includes, eliminate #include of "llvm/Type.h" which was redundant


---
Diffs of the changes:

Index: llvm/lib/Target/X86/Printer.cpp
diff -u llvm/lib/Target/X86/Printer.cpp:1.57 llvm/lib/Target/X86/Printer.cpp:1.58
--- llvm/lib/Target/X86/Printer.cpp:1.57	Mon Aug 11 15:04:57 2003
+++ llvm/lib/Target/X86/Printer.cpp	Mon Aug 11 15:06:16 2003
@@ -9,15 +9,14 @@
 
 #include "X86.h"
 #include "X86InstrInfo.h"
-#include "llvm/Module.h"
-#include "llvm/Type.h"
 #include "llvm/Constants.h"
 #include "llvm/DerivedTypes.h"
-#include "llvm/Target/TargetMachine.h"
+#include "llvm/Module.h"
+#include "llvm/Assembly/Writer.h"
 #include "llvm/CodeGen/MachineFunctionPass.h"
 #include "llvm/CodeGen/MachineConstantPool.h"
 #include "llvm/CodeGen/MachineInstr.h"
-#include "llvm/Assembly/Writer.h"
+#include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/Mangler.h"
 #include "Support/StringExtras.h"
 #include "Support/CommandLine.h"




From lattner at cs.uiuc.edu  Mon Aug 11 15:27:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 15:27:02 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp InstrSelectorEmitter.h
Message-ID: <200308112026.PAA00474@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.23 -> 1.24
InstrSelectorEmitter.h updated: 1.14 -> 1.15

---
Log message:

Add support for the Arg1 argument type


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.23 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.24
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.23	Mon Aug 11 10:47:35 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 15:25:52 2003
@@ -17,6 +17,7 @@
   if (Name == "DNVT_void") return Void;
   if (Name == "DNVT_val" ) return Val;
   if (Name == "DNVT_arg0") return Arg0;
+  if (Name == "DNVT_arg1") return Arg1;
   if (Name == "DNVT_ptr" ) return Ptr;
   throw "Unknown DagNodeValType '" + Name + "'!";
 }
@@ -277,6 +278,10 @@
       MadeChange |= Child->updateNodeType(N->getChild(0)->getType(),
                                           TheRecord->getName());
       break;
+    case NodeType::Arg1:
+      MadeChange |= Child->updateNodeType(N->getChild(1)->getType(),
+                                          TheRecord->getName());
+      break;
     case NodeType::Val:
       if (Child->getType() == MVT::isVoid)
         error("Inferred a void node in an illegal place!");
@@ -298,7 +303,10 @@
     MadeChange |= N->updateNodeType(N->getChild(0)->getType(),
                                     TheRecord->getName());
     break;
-
+  case NodeType::Arg1:
+    MadeChange |= N->updateNodeType(N->getChild(1)->getType(),
+                                    TheRecord->getName());
+    break;
   case NodeType::Ptr:
     MadeChange |= N->updateNodeType(ISE.getTarget().getPointerType(),
                                     TheRecord->getName());
@@ -426,12 +434,15 @@
 
       if (a == 0 && ArgTypes.back() == NodeType::Arg0)
         throw "In node " + Node->getName() + ", arg 0 cannot have type 'arg0'!";
+      if (a == 1 && ArgTypes.back() == NodeType::Arg1)
+        throw "In node " + Node->getName() + ", arg 1 cannot have type 'arg1'!";
       if (ArgTypes.back() == NodeType::Void)
         throw "In node " + Node->getName() + ", args cannot be void type!";
     }
-    if (RetTy == NodeType::Arg0 && Args->getSize() == 0)
+    if ((RetTy == NodeType::Arg0 && Args->getSize() == 0) ||
+        (RetTy == NodeType::Arg1 && Args->getSize() < 2))
       throw "In node " + Node->getName() +
-            ", invalid return type for nullary node!";
+            ", invalid return type for node with this many operands!";
 
     // Add the node type mapping now...
     NodeTypes[Node] = NodeType(RetTy, ArgTypes);


Index: llvm/utils/TableGen/InstrSelectorEmitter.h
diff -u llvm/utils/TableGen/InstrSelectorEmitter.h:1.14 llvm/utils/TableGen/InstrSelectorEmitter.h:1.15
--- llvm/utils/TableGen/InstrSelectorEmitter.h:1.14	Sun Aug 10 18:51:52 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.h	Mon Aug 11 15:25:52 2003
@@ -23,6 +23,7 @@
     // Both argument and return types...
     Val,            // A non-void type
     Arg0,           // Value matches the type of Arg0
+    Arg1,           // Value matches the type of Arg1
     Ptr,            // Tree node is the type of the target pointer
 
     // Return types




From lattner at cs.uiuc.edu  Mon Aug 11 15:33:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 15:33:02 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp InstrSelectorEmitter.h
Message-ID: <200308112032.PAA01224@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.24 -> 1.25
InstrSelectorEmitter.h updated: 1.15 -> 1.16

---
Log message:

Add support for naming the destination of a "set" in a pattern


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.24 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.25
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.24	Mon Aug 11 15:25:52 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 15:32:02 2003
@@ -138,6 +138,7 @@
       if (!Tree->getChild(0)->isLeaf())
         error("Arg #0 of set should be a register or register class!");
       Result = Tree->getChild(0)->getValueRecord();
+      ResultName = Tree->getChildName(0);
       Tree = Tree->getChild(1);
     }
   }
@@ -895,6 +896,9 @@
   for (unsigned i = 0, e = P->getNumArgs(); i != e; ++i)
     if (P->getArgName(i) == ArgName)
       return Operands[i].second + "->Val";
+
+  if (ArgName == P->getResultName())
+    return "NewReg";
   P->error("Pattern does not define a value named $" + ArgName + "!");
   return "";
 }


Index: llvm/utils/TableGen/InstrSelectorEmitter.h
diff -u llvm/utils/TableGen/InstrSelectorEmitter.h:1.15 llvm/utils/TableGen/InstrSelectorEmitter.h:1.16
--- llvm/utils/TableGen/InstrSelectorEmitter.h:1.15	Mon Aug 11 15:25:52 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.h	Mon Aug 11 15:32:02 2003
@@ -142,6 +142,7 @@
   /// register result, specified with a (set) in the pattern.
   ///
   Record *Result;
+  std::string ResultName;     // The name of the result value...
 
   /// TheRecord - The actual TableGen record corresponding to this pattern.
   ///
@@ -185,6 +186,7 @@
   TreePatternNode *getTree() const { return Tree; }
   
   Record *getResult() const { return Result; }
+  const std::string &getResultName() const { return ResultName; }
 
   /// getRecord - Return the actual TableGen record corresponding to this
   /// pattern.




From lattner at cs.uiuc.edu  Mon Aug 11 16:30:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 16:30:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Target.td
Message-ID: <200308112129.QAA07545@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

Target.td updated: 1.19 -> 1.20

---
Log message:

add frameidx support
Make load work
Make type inference infer from Arg1 to arg0 as well as from arg0 to arg1


---
Diffs of the changes:

Index: llvm/lib/Target/Target.td
diff -u llvm/lib/Target/Target.td:1.19 llvm/lib/Target/Target.td:1.20
--- llvm/lib/Target/Target.td:1.19	Mon Aug 11 10:24:02 2003
+++ llvm/lib/Target/Target.td	Mon Aug 11 16:29:40 2003
@@ -159,6 +159,7 @@
 def DNVT_void  : DagNodeValType;  // Tree node always returns void
 def DNVT_val   : DagNodeValType;  // A non-void type
 def DNVT_arg0  : DagNodeValType;  // Tree node returns same type as Arg0
+def DNVT_arg1  : DagNodeValType;  // Tree node returns same type as Arg1
 def DNVT_ptr   : DagNodeValType;  // The target pointer type
 
 class DagNode<DagNodeValType ret, list<DagNodeValType> args> {
@@ -179,23 +180,23 @@
 
 // Terminals...
 def imm : BuiltinDagNode<DNVT_val, [], "Constant">;
-// def frameidx : BuiltinDagNode<DNVT_ptr, [], "FrameIndex">;
+def frameidx : BuiltinDagNode<DNVT_ptr, [], "FrameIndex">;
 
 // Arithmetic...
-def plus    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Plus">;
-def minus   : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Minus">;
-def times   : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Times">;
-def sdiv    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "SDiv">;
-def udiv    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "UDiv">;
-def srem    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "SRem">;
-def urem    : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "URem">;
-def and     : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "And">;
-def or      : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Or">;
-def xor     : BuiltinDagNode<DNVT_arg0, [DNVT_val, DNVT_arg0], "Xor">;
+def plus    : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Plus">;
+def minus   : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Minus">;
+def times   : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Times">;
+def sdiv    : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "SDiv">;
+def udiv    : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "UDiv">;
+def srem    : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "SRem">;
+def urem    : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "URem">;
+def and     : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "And">;
+def or      : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Or">;
+def xor     : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Xor">;
 
 
-def load    : DagNode<DNVT_val, [DNVT_ptr]>;
-//def store   : DagNode<2, DNVT_Void>;
+def load    : BuiltinDagNode<DNVT_val, [DNVT_ptr], "Load">;
+//def store   : BuiltinDagNode<DNVT_Void, [DNVT_ptr, DNVT_val]>;
 
 // Other...
 def ret     : BuiltinDagNode<DNVT_void, [DNVT_val], "Ret">;




From lattner at cs.uiuc.edu  Mon Aug 11 16:30:05 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 16:30:05 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp InstrSelectorEmitter.h
Message-ID: <200308112129.QAA07526@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.25 -> 1.26
InstrSelectorEmitter.h updated: 1.16 -> 1.17

---
Log message:

Add support for frameidx and literal immediates for instructions


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.25 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.26
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.25	Mon Aug 11 15:32:02 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 16:28:59 2003
@@ -117,7 +117,7 @@
 //
 Pattern::Pattern(PatternType pty, DagInit *RawPat, Record *TheRec,
                  InstrSelectorEmitter &ise)
-  : PTy(pty), Result(0), TheRecord(TheRec), ISE(ise) {
+  : PTy(pty), ResultNode(0), TheRecord(TheRec), ISE(ise) {
 
   // First, parse the pattern...
   Tree = ParseTreePattern(RawPat);
@@ -137,7 +137,7 @@
       assert(Tree->getNumChildren() == 2 && "Set with != 2 arguments?");
       if (!Tree->getChild(0)->isLeaf())
         error("Arg #0 of set should be a register or register class!");
-      Result = Tree->getChild(0)->getValueRecord();
+      ResultNode = Tree->getChild(0);
       ResultName = Tree->getChildName(0);
       Tree = Tree->getChild(1);
     }
@@ -855,11 +855,14 @@
 /// name.
 void InstrSelectorEmitter::PrintExpanderOperand(Init *Arg,
                                                 const std::string &NameVar,
-                                                Record *ArgDecl,
+                                                TreePatternNode *ArgDeclNode,
                                                 Pattern *P, bool PrintArg,
                                                 std::ostream &OS) {
   if (DefInit *DI = dynamic_cast<DefInit*>(Arg)) {
     Record *Arg = DI->getDef();
+    if (!ArgDeclNode->isLeaf())
+      P->error("Expected leaf node as argument!");
+    Record *ArgDecl = ArgDeclNode->getValueRecord();
     if (Arg->isSubClassOf("Register")) {
       // This is a physical register reference... make sure that the instruction
       // requested a register!
@@ -882,8 +885,28 @@
       OS << NameVar;
       if (PrintArg) OS << ")";
       return;
+    } else if (Arg->getName() == "frameidx") {
+      if (!PrintArg) P->error("Cannot define a new frameidx value!");
+      OS << ".addFrameIndex(" << NameVar << ")";
+      return;
     }
     P->error("Unknown operand type '" + Arg->getName() + "' to expander!");
+  } else if (IntInit *II = dynamic_cast<IntInit*>(Arg)) {
+    if (!NameVar.empty())
+      P->error("Illegal to specify a name for a constant initializer arg!");
+
+    // Hack this check to allow R32 values with 0 as the initializer for memory
+    // references... FIXME!
+    if (ArgDeclNode->isLeaf() && II->getValue() == 0 &&
+        ArgDeclNode->getValueRecord()->getName() == "R32") {
+      OS << ".addReg(0)";
+    } else {
+      if (ArgDeclNode->isLeaf() || ArgDeclNode->getOperator()->getName()!="imm")
+        P->error("Illegal immediate int value '" + itostr(II->getValue()) +
+               "' operand!");
+      OS << ".addZImm(" << II->getValue() << ")";
+    }
+    return;
   }
   P->error("Unknown operand type to expander!");
 }
@@ -1201,7 +1224,8 @@
               std::string ArgNameVal =
                 getArgName(P, DIInst->getArgName(0), Operands);
               PrintExpanderOperand(DIInst->getArg(0), ArgNameVal,
-                                   R, P, false, OS << ", ");
+                                   InstPat->getResultNode(), P, false,
+                                   OS << ", ");
             }
             OS << ")";
 
@@ -1210,7 +1234,7 @@
                 getArgName(P, DIInst->getArgName(i), Operands);
 
               PrintExpanderOperand(DIInst->getArg(i), ArgNameVal,
-                                  InstPat->getArgRec(i-hasResult), P, true, OS);
+                                   InstPat->getArg(i-hasResult), P, true, OS);
             }
 
             OS << ";\n";


Index: llvm/utils/TableGen/InstrSelectorEmitter.h
diff -u llvm/utils/TableGen/InstrSelectorEmitter.h:1.16 llvm/utils/TableGen/InstrSelectorEmitter.h:1.17
--- llvm/utils/TableGen/InstrSelectorEmitter.h:1.16	Mon Aug 11 15:32:02 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.h	Mon Aug 11 16:28:59 2003
@@ -141,8 +141,8 @@
   /// Result - If this is an instruction or expander pattern, this is the
   /// register result, specified with a (set) in the pattern.
   ///
-  Record *Result;
-  std::string ResultName;     // The name of the result value...
+  std::string ResultName;      // The name of the result value...
+  TreePatternNode *ResultNode; // The leaf node for the result register...
 
   /// TheRecord - The actual TableGen record corresponding to this pattern.
   ///
@@ -172,8 +172,9 @@
 
   /// Pattern - Constructor used for cloning nonterminal patterns
   Pattern(TreePatternNode *tree, Record *rec, bool res,
-          InstrSelectorEmitter &ise) : PTy(Nonterminal), Tree(tree), Result(0),
-                                       TheRecord(rec), Resolved(res), ISE(ise) {
+          InstrSelectorEmitter &ise)
+    : PTy(Nonterminal), Tree(tree), ResultNode(0), TheRecord(rec),
+      Resolved(res), ISE(ise) {
     calculateArgs(Tree, "");
   }
 
@@ -185,8 +186,11 @@
   ///
   TreePatternNode *getTree() const { return Tree; }
   
-  Record *getResult() const { return Result; }
+  Record *getResult() const {
+    return ResultNode ? ResultNode->getValueRecord() : 0;
+  }
   const std::string &getResultName() const { return ResultName; }
+  TreePatternNode *getResultNode() const { return ResultNode; }
 
   /// getRecord - Return the actual TableGen record corresponding to this
   /// pattern.
@@ -201,6 +205,9 @@
   Record *getArgRec(unsigned i) const {
     return getArg(i)->getValueRecord();
   }
+  Init *getArgVal(unsigned i) const {
+    return getArg(i)->getValue();
+  }
   const std::string &getArgName(unsigned i) const {
     assert(i < Args.size() && "Argument reference out of range!");
     return Args[i].second;
@@ -372,7 +379,7 @@
   /// to the BuildMI call.  If it is false, we are printing the result register
   /// name.
   void PrintExpanderOperand(Init *Arg, const std::string &NameVar,
-                            Record *ArgDecl, Pattern *P,
+                            TreePatternNode *ArgDecl, Pattern *P,
                             bool PrintArg, std::ostream &OS);
 };
 




From lattner at cs.uiuc.edu  Mon Aug 11 16:31:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 16:31:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrInfo.td
Message-ID: <200308112130.QAA07564@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86InstrInfo.td updated: 1.8 -> 1.9

---
Log message:

Add basic support for 16 and 32 bit function arguments!


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.8 llvm/lib/Target/X86/X86InstrInfo.td:1.9
--- llvm/lib/Target/X86/X86InstrInfo.td:1.8	Mon Aug 11 10:48:00 2003
+++ llvm/lib/Target/X86/X86InstrInfo.td	Mon Aug 11 16:30:00 2003
@@ -175,8 +175,10 @@
 def MOVim32 : X86Inst<"mov", 0xC7, MRMS0m    , Arg32>;            // [mem] = imm32
 
 def MOVmr8  : X86Inst<"mov", 0x8A, MRMSrcMem , Arg8>;             // R8  = [mem]
-def MOVmr16 : X86Inst<"mov", 0x8B, MRMSrcMem , Arg16>, OpSize;    // R16 = [mem]
-def MOVmr32 : X86Inst<"mov", 0x8B, MRMSrcMem , Arg32>;            // R32 = [mem]
+def MOVmr16 : X86Inst<"mov", 0x8B, MRMSrcMem , Arg16>, OpSize,    // R16 = [mem]
+              Pattern<(set R16, (load (plus R32, (plus (times imm, R32), imm))))>;
+def MOVmr32 : X86Inst<"mov", 0x8B, MRMSrcMem , Arg32>,            // R32 = [mem]
+              Pattern<(set R32, (load (plus R32, (plus (times imm, R32), imm))))>;
 
 def MOVrm8  : X86Inst<"mov", 0x88, MRMDestMem, Arg8>;             // [mem] = R8
 def MOVrm16 : X86Inst<"mov", 0x89, MRMDestMem, Arg16>, OpSize;    // [mem] = R16
@@ -439,3 +441,13 @@
 def RET_R32 : Expander<(ret R32:$reg),
                        [(MOVrr32 EAX, R32:$reg),
                         (RET)]>;
+
+// FIXME: This should eventually just be implemented by defining a frameidx as a
+// value address for a load.
+def LOAD_FI16 : Expander<(set R16:$dest, (load frameidx:$fi)),
+                         [(MOVmr16 R16:$dest, frameidx:$fi, 1, 0/*NoReg*/, 0)]>;
+
+def LOAD_FI32 : Expander<(set R32:$dest, (load frameidx:$fi)),
+                         [(MOVmr32 R32:$dest, frameidx:$fi, 1, 0/*NoReg*/, 0)]>;
+
+




From criswell at cs.uiuc.edu  Mon Aug 11 17:03:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Mon Aug 11 17:03:01 2003
Subject: [llvm-commits] CVS: poolalloc/configure
Message-ID: <200308112202.RAA12319@choi.cs.uiuc.edu>


Changes in directory poolalloc:

configure updated: 1.1.1.1 -> 1.2

---
Log message:

Changed the default location of the LLVM object files to be the same place as
the LLVM source files.


---
Diffs of the changes:

Index: poolalloc/configure
diff -u poolalloc/configure:1.1.1.1 poolalloc/configure:1.2
--- poolalloc/configure:1.1.1.1	Mon Aug 11 16:29:15 2003
+++ poolalloc/configure	Mon Aug 11 17:02:47 2003
@@ -1259,7 +1259,7 @@
   LLVM_OBJ=$withval
 
 else
-  LLVM_OBJ=/home/vadve/${USER}/llvm
+  LLVM_OBJ=${LLVM_SRC}
 
 fi;
 




From brukman at cs.uiuc.edu  Mon Aug 11 17:03:04 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 17:03:04 2003
Subject: [llvm-commits] CVS: CVSROOT/loginfo
Message-ID: <200308112202.RAA11506@zion.cs.uiuc.edu>


Changes in directory CVSROOT:

loginfo updated: 1.31 -> 1.32

---
Log message:

* Spaced things out evenly
* Send out commit messages for the `poolalloc' module
* Stop saving commit messages in `commitlog' file, it's no longer necessary
  (it was only used for testing while writing the addition to commit-diffs.pl
   script to save the name of the branch on which commits were made)


---
Diffs of the changes:

Index: CVSROOT/loginfo
diff -u CVSROOT/loginfo:1.31 CVSROOT/loginfo:1.32
--- CVSROOT/loginfo:1.31	Fri Aug  1 15:30:32 2003
+++ CVSROOT/loginfo	Mon Aug 11 17:01:59 2003
@@ -27,8 +27,7 @@
 
 #^CVSROOT    mailx -s 'CVSROOT commit %s' llvm-commits at cs.uiuc.edu
 #^llvm       mailx -s 'LLVM CVS: %s' llvm-commits at cs.uiuc.edu
-^llvm/www	( /home/vadve/vadve/Research/DynOpt/CVSRepository/CVSROOT/update-www.sh &); /home/vadve/vadve/Research/DynOpt/CVSRepository/CVSROOT/commit-diffs.pl %{sVv} llvm-commits at cs.uiuc.edu
-^llvm	/home/vadve/vadve/Research/DynOpt/CVSRepository/CVSROOT/commit-diffs.pl %{sVv} llvm-commits at cs.uiuc.edu
+^llvm/www	  ( /home/vadve/vadve/Research/DynOpt/CVSRepository/CVSROOT/update-www.sh &); /home/vadve/vadve/Research/DynOpt/CVSRepository/CVSROOT/commit-diffs.pl %{sVv} llvm-commits at cs.uiuc.edu
+^llvm	      /home/vadve/vadve/Research/DynOpt/CVSRepository/CVSROOT/commit-diffs.pl %{sVv} llvm-commits at cs.uiuc.edu
+^poolalloc  /home/vadve/vadve/Research/DynOpt/CVSRepository/CVSROOT/commit-diffs.pl %{sVv} llvm-commits at cs.uiuc.edu
 ^CVSROOT    /home/vadve/vadve/Research/DynOpt/CVSRepository/CVSROOT/commit-diffs.pl %{sVv} llvm-commits at cs.uiuc.edu
-
-ALL (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog




From criswell at cs.uiuc.edu  Mon Aug 11 17:08:04 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Mon Aug 11 17:08:04 2003
Subject: [llvm-commits] CVS: poolalloc/bytecode/Makefile
Message-ID: <200308112207.RAA14280@choi.cs.uiuc.edu>


Changes in directory poolalloc/bytecode:

Makefile updated: 1.1.1.1 -> 1.2

---
Log message:

Changed the name of the bytecode directory from poolalloc to PoolAllocator.



---
Diffs of the changes:

Index: poolalloc/bytecode/Makefile
diff -u poolalloc/bytecode/Makefile:1.1.1.1 poolalloc/bytecode/Makefile:1.2
--- poolalloc/bytecode/Makefile:1.1.1.1	Mon Aug 11 16:29:15 2003
+++ poolalloc/bytecode/Makefile	Mon Aug 11 17:06:53 2003
@@ -6,6 +6,6 @@
 #
 # List all of the subdirectories that we will compile.
 #
-DIRS=poolalloc
+DIRS=PoolAllocator
 
 include $(LEVEL)/Makefile.common




From criswell at cs.uiuc.edu  Mon Aug 11 17:08:09 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Mon Aug 11 17:08:09 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
Message-ID: <200308112207.RAA13856@choi.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.15 -> 1.16

---
Log message:

Changed the location of the PoolAllocator.h header file.



---
Diffs of the changes:

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.15 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.16
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.15	Thu Aug  7 00:29:28 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Mon Aug 11 17:07:11 2003
@@ -6,7 +6,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "PoolAllocation"
-#include "llvm/Transforms/PoolAllocate.h"
+#include "poolalloc/PoolAllocate.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Analysis/DataStructure.h"
 #include "llvm/Analysis/DSGraph.h"




From brukman at cs.uiuc.edu  Mon Aug 11 17:29:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 17:29:01 2003
Subject: [llvm-commits] CVS: llvm/tools/llee/
Message-ID: <200308112228.RAA11676@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llee:


---
Log message:

Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/tools/llee added to the repository


---
Diffs of the changes:



From brukman at cs.uiuc.edu  Mon Aug 11 17:30:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Mon Aug 11 17:30:01 2003
Subject: [llvm-commits] CVS: llvm/tools/llee/ExecveHandler.c Makefile SysUtils.c SysUtils.h llee
Message-ID: <200308112229.RAA11717@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llee:

ExecveHandler.c added (r1.1)
Makefile added (r1.1)
SysUtils.c added (r1.1)
SysUtils.h added (r1.1)
llee added (r1.1)

---
Log message:

Initial checkin of the LLEE, the (LL)VM (E)xecution (E)nvironment.


---
Diffs of the changes:

Index: llvm/tools/llee/ExecveHandler.c
diff -c /dev/null llvm/tools/llee/ExecveHandler.c:1.1
*** /dev/null	Mon Aug 11 17:29:46 2003
--- llvm/tools/llee/ExecveHandler.c	Mon Aug 11 17:29:36 2003
***************
*** 0 ****
--- 1,92 ----
+ //===-- ExecveHandler.c - Replaces execve() to run LLVM files -------------===//
+ //
+ // This file implements a replacement execve() to spawn off LLVM programs to run
+ // transparently, without needing to be (JIT-)compiled manually by the user.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "SysUtils.h"
+ #include <Config/dlfcn.h>
+ #include <Config/errno.h>
+ #include <Config/stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+ 
+ /*
+  * This is the expected header for all valid LLVM bytecode files.
+  * The first four characters must be exactly this.
+  */
+ static const char llvmHeader[] = "llvm";
+ 
+ /*
+  * The type of the execve() function is long and boring, but required.
+  */
+ typedef int(*execveTy)(const char*, char *const[], char *const[]);
+ 
+ /*
+  * This method finds the real `execve' call in the C library and executes the
+  * given program.
+  */
+ int executeProgram(const char *filename, char *const argv[], char *const envp[])
+ {
+   /*
+    * Find a pointer to the *real* execve() function starting the search in the
+    * next library and forward, to avoid finding the one defined in this file.
+    */
+   char *error;
+   execveTy execvePtr = (execveTy) dlsym(RTLD_NEXT, "execve");
+   if ((error = dlerror()) != NULL) {
+     fprintf(stderr, "%s\n", error);
+     return -1;
+   }
+ 
+   /* Really execute the program */
+   return execvePtr(filename, argv, envp);
+ }
+ 
+ /*
+  * This replacement execve() function first checks the file to be executed
+  * to see if it is a valid LLVM bytecode file, and then either invokes our
+  * execution environment or passes it on to the system execve() call.
+  */
+ int execve(const char *filename, char *const argv[], char *const envp[])
+ {
+   /* Open the file, test to see if first four characters are "llvm" */
+   char header[4];
+   FILE *file = fopen(filename, "r");
+   /* Check validity of `file' */
+   if (errno) { return errno; }
+   /* Read the header from the file */
+   size_t headerSize = strlen(llvmHeader) - 1; // ignore the NULL terminator
+   size_t bytesRead = fread(header, sizeof(char), headerSize, file);
+   fclose(file);
+   if (bytesRead != headerSize) { 
+     return EIO;
+   }
+   if (!strncmp(llvmHeader, header, headerSize)) {
+     /* 
+      * This is a bytecode file, so execute the JIT with the program and
+      * parameters.
+      */
+     unsigned argvSize, idx;
+     for (argvSize = 0, idx = 0; argv[idx] && argv[idx][0]; ++idx)
+       ++argvSize;
+     char **LLIargs = (char**) malloc(sizeof(char*) * (argvSize+2));
+     char *LLIpath = FindExecutable("lli");
+     if (!LLIpath) {
+       fprintf(stderr, "Cannot find path to `lli', exiting.\n");
+       return -1;
+     }
+     LLIargs[0] = LLIpath;
+     for (idx = 0; idx != argvSize; ++idx)
+       LLIargs[idx+1] = argv[idx];
+     LLIargs[argvSize + 1] = '\0';
+     /*
+     for (idx = 0; idx != argvSize+2; ++idx)
+       printf("LLI args[%d] = \"%s\"\n", idx, LLIargs[idx]);
+     */
+     return executeProgram(LLIpath, LLIargs, envp);
+   }
+   executeProgram(filename, argv, envp); 
+   return 0;
+ }


Index: llvm/tools/llee/Makefile
diff -c /dev/null llvm/tools/llee/Makefile:1.1
*** /dev/null	Mon Aug 11 17:29:46 2003
--- llvm/tools/llee/Makefile	Mon Aug 11 17:29:36 2003
***************
*** 0 ****
--- 1,21 ----
+ LEVEL = ../..
+ include $(LEVEL)/Makefile.config
+ 
+ SRCS = ExecveHandler.c SysUtils.c
+ 
+ OBJS = $(SRCS:%.c=%.o)
+ SO   = execve.so
+ 
+ all: $(SO) execve_test
+ 	
+ %.o: %.c
+ 	gcc -g -I../../include -D_GNU_SOURCE $< -c -o $@
+ 
+ $(SO): $(OBJS)
+ 	gcc -g -shared -ldl -rdynamic $(OBJS) -o $@
+ 
+ execve_test: execve_test.c
+ 	gcc -g $< -o $@
+ 
+ clean:
+ 	rm -f $(OBJS) $(SO)


Index: llvm/tools/llee/SysUtils.c
diff -c /dev/null llvm/tools/llee/SysUtils.c:1.1
*** /dev/null	Mon Aug 11 17:29:46 2003
--- llvm/tools/llee/SysUtils.c	Mon Aug 11 17:29:36 2003
***************
*** 0 ****
--- 1,81 ----
+ //===- SystemUtils.h - Utilities to do low-level system stuff --*- C++ -*--===//
+ //
+ // This file contains functions used to do a variety of low-level, often
+ // system-specific, tasks.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "SysUtils.h"
+ #include "Config/sys/types.h"
+ #include "Config/sys/stat.h"
+ #include "Config/fcntl.h"
+ #include "Config/sys/wait.h"
+ #include "Config/unistd.h"
+ #include "Config/errno.h"
+ #include <stdlib.h>
+ #include <string.h>
+ 
+ /// isExecutableFile - This function returns true if the filename specified
+ /// exists and is executable.
+ ///
+ bool isExecutableFile(const char *ExeFileName) {
+   struct stat Buf;
+   if (stat(ExeFileName, &Buf))
+     return false;  // Must not be executable!
+ 
+   if (!(Buf.st_mode & S_IFREG))
+     return false;                    // Not a regular file?
+ 
+   if (Buf.st_uid == getuid())        // Owner of file?
+     return Buf.st_mode & S_IXUSR;
+   else if (Buf.st_gid == getgid())   // In group of file?
+     return Buf.st_mode & S_IXGRP;
+   else                               // Unrelated to file?
+     return Buf.st_mode & S_IXOTH;
+ }
+ 
+ /// FindExecutable - Find a named executable in the directories listed in $PATH.
+ /// If the executable cannot be found, returns NULL.
+ /// 
+ char *FindExecutable(const char *ExeName) {
+   /* Try to find the executable in the path */
+   const char *PathStr = getenv("PATH");
+   if (PathStr == 0) return "";
+ 
+   // Now we have a colon separated list of directories to search... try them...
+   unsigned PathLen = strlen(PathStr);
+   while (PathLen) {
+     /* Find the next colon */
+     const char *Colon = strchr(PathStr, ':');
+     
+     /* Check to see if this first directory contains the executable... */
+     unsigned DirLen = Colon ? (Colon-PathStr) : strlen(PathStr);
+     char *FilePath = alloca(sizeof(char) * (DirLen+1+strlen(ExeName)+1));
+     unsigned i, e;
+     for (i = 0; i != DirLen; ++i)
+       FilePath[i] = PathStr[i];
+     FilePath[i] = '/';
+     for (i = 0, e = strlen(ExeName); i != e; ++i)
+       FilePath[DirLen + 1 + i] = ExeName[i];
+     FilePath[DirLen + 1 + i] = '\0';
+     if (isExecutableFile(FilePath))
+       return strdup(FilePath); /* Found the executable! */
+ 
+     /* If Colon is NULL, there are no more colon separators and no more dirs */
+     if (!Colon) break;
+ 
+     /* Nope, it wasn't in this directory, check the next range! */
+     PathLen -= DirLen;
+     PathStr = Colon;
+     while (*PathStr == ':') {   /* Advance past colons */
+       PathStr++;
+       PathLen--;
+     }
+ 
+     /* Advance past the colon */
+     ++Colon;
+   }
+ 
+   // If we fell out, we ran out of directories in PATH to search, return failure
+   return NULL;
+ }


Index: llvm/tools/llee/SysUtils.h
diff -c /dev/null llvm/tools/llee/SysUtils.h:1.1
*** /dev/null	Mon Aug 11 17:29:46 2003
--- llvm/tools/llee/SysUtils.h	Mon Aug 11 17:29:36 2003
***************
*** 0 ****
--- 1,28 ----
+ /*===- sysutils.h - Utilities to do low-level system stuff -------*- C -*--===*\
+  *                                                                            *
+  * This file contains functions used to do a variety of low-level, often      *
+  * system-specific, tasks.                                                    *
+  *                                                                            *
+ \*===----------------------------------------------------------------------===*/
+ 
+ #ifndef SYSUTILS_H
+ #define SYSUTILS_H
+ 
+ typedef unsigned bool;
+ enum { false = 0, true = 1 };
+ 
+ /*
+  * isExecutableFile - This function returns true if the filename specified
+  * exists and is executable.
+  */
+ bool isExecutableFile(const char *ExeFileName);
+ 
+ /*
+  * FindExecutable - Find a named executable, giving the argv[0] of program
+  * being executed. This allows us to find another LLVM tool if it is built into
+  * the same directory, but that directory is neither the current directory, nor
+  * in the PATH.  If the executable cannot be found, return an empty string.
+  */ 
+ char *FindExecutable(const char *ExeName);
+ 
+ #endif


Index: llvm/tools/llee/llee
diff -c /dev/null llvm/tools/llee/llee:1.1
*** /dev/null	Mon Aug 11 17:29:46 2003
--- llvm/tools/llee/llee	Mon Aug 11 17:29:36 2003
***************
*** 0 ****
--- 1 ----
+ exec env LD_PRELOAD=`pwd`/execve.so $*




From lattner at cs.uiuc.edu  Mon Aug 11 17:32:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 17:32:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp
Message-ID: <200308112231.RAA10651@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.26 -> 1.27

---
Log message:

It is not an error if a rule does not match, it's just a failed match!


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.26 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.27
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.26	Mon Aug 11 16:28:59 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 17:30:51 2003
@@ -1064,8 +1064,9 @@
        << "    return N->getCostFor(" << SlotName << "_Slot);\n\n"
        << "  unsigned Cost;\n"
        << "  switch (N->getNodeType()) {\n"
-       << "  default: assert(0 && \"Unhandled node type for " << SlotName
-       << "!\");\n";
+       << "  default: Cost = ~0U >> 1;   // Match failed\n"
+       << "           N->setPatternCostFor(" << SlotName << "_Slot, NoMatchPattern, Cost, NumSlots);\n"
+       << "           break;\n";
 
     for (PatternOrganizer::NodesForSlot::iterator J = I->second.begin(),
            E = I->second.end(); J != E; ++J)




From criswell at cs.uiuc.edu  Mon Aug 11 18:01:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Mon Aug 11 18:01:01 2003
Subject: [llvm-commits] [pre-11] CVS: llvm/Makefile.common Makefile
Message-ID: <200308112300.SAA25807@choi.cs.uiuc.edu>


Changes in directory llvm:

Makefile.common updated: 1.108.2.1 -> 1.108.2.2
Makefile updated: 1.4 -> 1.4.8.1

---
Log message:

Fixed the distsclean target so that it works properly:
	o It does not remove the LLVM Makefiles when called from a project.
	o It does not work in any other directory other than the root
	  directory.
	o Dependencies are not loaded when the target is distclean.
To do this, I moved the distclean target from Makefile.common to Makefile and
added conditional includes around the Makefile.common section that includes
dependencies.


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.108.2.1 llvm/Makefile.common:1.108.2.2
--- llvm/Makefile.common:1.108.2.1	Thu Aug  7 10:51:08 2003
+++ llvm/Makefile.common	Mon Aug 11 18:00:23 2003
@@ -808,12 +808,6 @@
 	$(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
 	$(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT)
 
-distclean:: clean
-	$(VERB) (cd $(LLVM_SRC_ROOT); $(RM) -rf $(LEVEL)/Makefile.config \
-	            $(LEVEL)/include/Config/config.h \
-	            $(LEVEL)/autom4te.cache \
-	            $(LEVEL)/config.log)
-
 ###########################################################################
 # C/C++ Dependencies
 #	Define variables and rules that generate header file dependencies
@@ -841,7 +835,9 @@
 # are cleaning (this example taken from the GNU Make Manual).
 #
 ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(SourceDepend),)
 -include $(SourceDepend)
+endif
 endif
 endif


Index: llvm/Makefile
diff -u llvm/Makefile:1.4 llvm/Makefile:1.4.8.1
--- llvm/Makefile:1.4	Wed Jun 11 08:55:26 2003
+++ llvm/Makefile	Mon Aug 11 18:00:23 2003
@@ -6,3 +6,10 @@
 
 test :: all
 	cd test; $(MAKE)
+
+distclean:: clean
+	$(VERB) $(RM) -rf $(LEVEL)/Makefile.config \
+	                  $(LEVEL)/include/Config/config.h \
+	                  $(LEVEL)/autoconf/autom4te.cache \
+	                  $(LEVEL)/config.log
+




From criswell at cs.uiuc.edu  Mon Aug 11 18:03:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Mon Aug 11 18:03:01 2003
Subject: [llvm-commits] [pre-11] CVS: llvm/Makefile
Message-ID: <200308112302.SAA31593@choi.cs.uiuc.edu>


Changes in directory llvm:

Makefile updated: 1.4.8.1 -> 1.4.8.2

---
Log message:

Added the TAGS file to the list of files to remove when distclean'ing.



---
Diffs of the changes:

Index: llvm/Makefile
diff -u llvm/Makefile:1.4.8.1 llvm/Makefile:1.4.8.2
--- llvm/Makefile:1.4.8.1	Mon Aug 11 18:00:23 2003
+++ llvm/Makefile	Mon Aug 11 18:01:50 2003
@@ -11,5 +11,6 @@
 	$(VERB) $(RM) -rf $(LEVEL)/Makefile.config \
 	                  $(LEVEL)/include/Config/config.h \
 	                  $(LEVEL)/autoconf/autom4te.cache \
-	                  $(LEVEL)/config.log
+	                  $(LEVEL)/config.log \
+	                  $(LEVEL)/TAGS
 




From kowshik at cs.uiuc.edu  Mon Aug 11 19:44:01 2003
From: kowshik at cs.uiuc.edu (Sumant Kowshik)
Date: Mon Aug 11 19:44:01 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libpoolalloc/PoolAllocatorChained.c
Message-ID: <200308120043.TAA15894@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libpoolalloc:

PoolAllocatorChained.c updated: 1.3 -> 1.4

---
Log message:

Minor fix so that the program exits upon a poolfree failure

---
Diffs of the changes:

Index: llvm/test/Libraries/libpoolalloc/PoolAllocatorChained.c
diff -u llvm/test/Libraries/libpoolalloc/PoolAllocatorChained.c:1.3 llvm/test/Libraries/libpoolalloc/PoolAllocatorChained.c:1.4
--- llvm/test/Libraries/libpoolalloc/PoolAllocatorChained.c:1.3	Thu Aug  7 00:31:04 2003
+++ llvm/test/Libraries/libpoolalloc/PoolAllocatorChained.c	Mon Aug 11 19:43:23 2003
@@ -242,6 +242,7 @@
     
     if (!ALLOCATION_BEGINS(PS, Idx)) { 
       printf("poolfree: Attempt to free middle of allocated array\n");
+      exit(1);
     }
 
     /* Free the first node */




From kowshik at cs.uiuc.edu  Mon Aug 11 19:46:02 2003
From: kowshik at cs.uiuc.edu (Sumant Kowshik)
Date: Mon Aug 11 19:46:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/PoolAllocate.cpp
Message-ID: <200308120045.TAA15908@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

PoolAllocate.cpp updated: 1.15 -> 1.16

---
Log message:

Bug fix: Some nodes pointed to by globals may not be marked incomplete and need to be tracked to find pool arguments

---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/PoolAllocate.cpp
diff -u llvm/lib/Transforms/IPO/PoolAllocate.cpp:1.15 llvm/lib/Transforms/IPO/PoolAllocate.cpp:1.16
--- llvm/lib/Transforms/IPO/PoolAllocate.cpp:1.15	Thu Aug  7 00:29:28 2003
+++ llvm/lib/Transforms/IPO/PoolAllocate.cpp	Mon Aug 11 19:45:13 2003
@@ -254,14 +254,27 @@
 
 void PoolAllocate::FindFunctionPoolArgs(Function &F) {
 
-  // The DSGraph is merged with the globals graph. 
   DSGraph &G = BU->getDSGraph(F);
-  G.mergeInGlobalsGraph();
-
+ 
   // Inline the potential targets of indirect calls
   hash_set<Function*> visitedFuncs;
   InlineIndirectCalls(F, G, visitedFuncs);
 
+  // The DSGraph is merged with the globals graph. 
+  G.mergeInGlobalsGraph();
+
+  // The nodes reachable from globals need to be recognized as potential 
+  // arguments. This is required because, upon merging in the globals graph,
+  // the nodes pointed to by globals that are not live are not marked 
+  // incomplete.
+  hash_set<DSNode*> NodesFromGlobals;
+  for (DSGraph::ScalarMapTy::iterator I = G.getScalarMap().begin(), 
+	 E = G.getScalarMap().end(); I != E; ++I)
+    if (isa<GlobalValue>(I->first)) {             // Found a global
+      DSNodeHandle &GH = I->second;
+      GH.getNode()->markReachableNodes(NodesFromGlobals);
+    }
+
   // At this point the DS Graphs have been modified in place including
   // information about globals as well as indirect calls, making it useful
   // for pool allocation
@@ -296,8 +309,8 @@
     for (unsigned i = 0, e = Nodes.size(); i != e; ++i) {
       if (Nodes[i]->isGlobalNode() && !Nodes[i]->isIncomplete())
         DEBUG(std::cerr << "Global node is not Incomplete\n");
-      if ((Nodes[i]->isIncomplete() || Nodes[i]->isGlobalNode()) && 
-	  Nodes[i]->isHeapNode())
+      if ((Nodes[i]->isIncomplete() || Nodes[i]->isGlobalNode() || 
+	   NodesFromGlobals.count(Nodes[i])) && Nodes[i]->isHeapNode())
         Nodes[i]->markReachableNodes(MarkedNodes);
     }
 




From vadve at cs.uiuc.edu  Mon Aug 11 22:03:00 2003
From: vadve at cs.uiuc.edu (Vikram Adve)
Date: Mon Aug 11 22:03:00 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/UnitTests/2003-08-11-VaListArg.c
Message-ID: <200308120302.WAA28116@tank.cs.uiuc.edu>


Changes in directory llvm/test/Programs/SingleSource/UnitTests:

2003-08-11-VaListArg.c added (r1.1)

---
Log message:

Similar to 2003-05-07-VarArgs.c, but with 2 variations:
(a) pass the va_list to a function that does the actual work.
    (later this should test calling va_arg in both the varargs function
    and in the callee).
(b) pass a copy of the va_list to a different function.


---
Diffs of the changes:

Index: llvm/test/Programs/SingleSource/UnitTests/2003-08-11-VaListArg.c
diff -c /dev/null llvm/test/Programs/SingleSource/UnitTests/2003-08-11-VaListArg.c:1.1
*** /dev/null	Mon Aug 11 22:02:43 2003
--- llvm/test/Programs/SingleSource/UnitTests/2003-08-11-VaListArg.c	Mon Aug 11 22:02:33 2003
***************
*** 0 ****
--- 1,96 ----
+ /*
+  * Test passing a va_list argument to a function and other uses
+  * of va_list, in things other than va_arg.
+  */
+ #include <stdio.h>
+ #include <stdarg.h>
+ 
+ /* 5 bytes. */
+ typedef struct DWordS_struct    { int i; char c; } DWordS;
+ 
+ /* 12 bytes if d is 4-byte aligned; 16 bytes if d is 8-byte aligned. */
+ typedef struct QuadWordS_struct { int i; double d; } QuadWordS;
+ 
+ /* 20 bytes if d is 4-byte aligned; 28 bytes if d is 8-byte aligned
+  * (assuming pointer size is 4 bytes and 8 bytes respectively). */
+ typedef struct LargeS_struct { int i; double d; DWordS* ptr; int j; } LargeS;
+ 
+ void test(char *fmt, va_list ap) {
+   int d;
+   char c, *s;
+   DWordS dw;
+   QuadWordS qw;
+   LargeS ls;
+ 
+   while (*fmt)
+     switch(*fmt++) {
+     case 's':           /* string */
+       s = va_arg(ap, char *);
+       printf("string %s\n", s);
+       break;
+     case 'i':           /* int */
+       d = va_arg(ap, int);
+       printf("int %d\n", d);
+       break;
+     case 'd':
+       printf("double %f\n", va_arg(ap, double));
+       break;
+     case 'l':
+       printf("long long %lld\n", va_arg(ap, long long));
+       break;
+     case 'c':           /* char */
+       /* need a cast here since va_arg only
+          takes fully promoted types */
+       c = (char) va_arg(ap, int);
+       printf("char %c\n", c);
+       break;
+     case 'D':
+       dw = va_arg(ap, DWordS);
+       printf("DWord { %d, %c }\n", dw.i, dw.c);
+       break;
+     case 'Q':
+       qw = va_arg(ap, QuadWordS);
+       printf("QuadWord { %d, %f }\n", qw.i, qw.d);
+       break;
+     case 'L':
+       ls = va_arg(ap, LargeS);
+       printf("LargeS { %d, %f, 0x%d, %d }\n", ls.i, ls.d, ls.ptr != 0, ls.j);
+       break;
+     }
+   va_end(ap);
+ }
+ 
+ void testVaListArg(char *fmt, ...) {
+   va_list ap;
+   va_start(ap, fmt);
+   test(fmt, ap);
+   va_end(ap);
+ }
+ 
+ void testVaCopyArg(char *fmt, ...) {
+   va_list ap, aq;
+   va_start(ap, fmt);
+   va_copy(aq, ap);    /* test va_copy */
+   test(fmt, aq);
+   va_end(aq);
+   va_end(ap);
+ }
+ 
+ int main() {
+   DWordS dw = { 18, 'a' };
+   QuadWordS qw = { 19, 20.0 };
+   LargeS ls = { 21, 22.0, &dw, 23 };
+ 
+   testVaListArg("ssiciiiiis", "abc", "def", -123, 'a', 123, 6, 7, 8, 9, "10 args done!");
+   testVaCopyArg("ssiciiiiis", "abc", "def", -123, 'a', 123, 6, 7, 8, 9, "10 args done!");
+ 
+   /* test promotion & 64-bit types */
+   testVaListArg("ddil", 1.0, 2.0f, (short)32764, 12345677823423LL);
+   testVaCopyArg("ddil", 1.0, 2.0f, (short)32764, 12345677823423LL);
+ 
+   /* test passing structs by value to varargs */
+   testVaListArg("DQL", dw, qw, ls);
+   testVaCopyArg("DQL", dw, qw, ls);
+ 
+   return 0;
+ }




From vadve at cs.uiuc.edu  Mon Aug 11 22:05:00 2003
From: vadve at cs.uiuc.edu (Vikram Adve)
Date: Mon Aug 11 22:05:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcInstrSelection.cpp
Message-ID: <200308120304.WAA32242@psmith.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcInstrSelection.cpp updated: 1.115 -> 1.116

---
Log message:

Fix va_arg to generate LDDFi for floating point values, instead of LDXi.
All non-FP cases use LDXi as before.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcInstrSelection.cpp
diff -u llvm/lib/Target/Sparc/SparcInstrSelection.cpp:1.115 llvm/lib/Target/Sparc/SparcInstrSelection.cpp:1.116
--- llvm/lib/Target/Sparc/SparcInstrSelection.cpp:1.115	Mon Aug 11 13:42:47 2003
+++ llvm/lib/Target/Sparc/SparcInstrSelection.cpp	Mon Aug 11 22:04:05 2003
@@ -2807,13 +2807,15 @@
       case 64:	// reg:   Phi(reg,reg)
         break;                          // don't forward the value
 
-      case 65:	// reg:   VaArg(reg)
+      case 65:	// reg:   VaArg(reg): the va_arg instruction
       {
         // Use value initialized by va_start as pointer to args on the stack.
         // Load argument via current pointer value, then increment pointer.
         int argSize = target.getFrameInfo().getSizeOfEachArgOnStack();
         Instruction* vaArgI = subtreeRoot->getInstruction();
-        mvec.push_back(BuildMI(V9::LDXi, 3).addReg(vaArgI->getOperand(0)).
+        MachineOpCode loadOp = vaArgI->getType()->isFloatingPoint()? V9::LDDFi
+                                                                   : V9::LDXi;
+        mvec.push_back(BuildMI(loadOp, 3).addReg(vaArgI->getOperand(0)).
                        addSImm(0).addRegDef(vaArgI));
         mvec.push_back(BuildMI(V9::ADDi, 3).addReg(vaArgI->getOperand(0)).
                        addSImm(argSize).addRegDef(vaArgI->getOperand(0)));




From lattner at cs.uiuc.edu  Mon Aug 11 23:13:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 23:13:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp InstrSelectorEmitter.h
Message-ID: <200308120412.XAA06849@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.27 -> 1.28
InstrSelectorEmitter.h updated: 1.17 -> 1.18

---
Log message:

Add support for a bool argty


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.27 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.28
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.27	Mon Aug 11 17:30:51 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 23:12:42 2003
@@ -19,6 +19,7 @@
   if (Name == "DNVT_arg0") return Arg0;
   if (Name == "DNVT_arg1") return Arg1;
   if (Name == "DNVT_ptr" ) return Ptr;
+  if (Name == "DNVT_bool") return Bool;
   throw "Unknown DagNodeValType '" + Name + "'!";
 }
 
@@ -275,6 +276,9 @@
     AnyUnset |= InferTypes(Child, MadeChange);
 
     switch (NT.ArgTypes[i]) {
+    case NodeType::Bool:
+      MadeChange |= Child->updateNodeType(MVT::i1, TheRecord->getName());
+      break;
     case NodeType::Arg0:
       MadeChange |= Child->updateNodeType(N->getChild(0)->getType(),
                                           TheRecord->getName());
@@ -299,6 +303,9 @@
   switch (NT.ResultType) {
   case NodeType::Void:
     MadeChange |= N->updateNodeType(MVT::isVoid, TheRecord->getName());
+    break;
+  case NodeType::Bool:
+    MadeChange |= N->updateNodeType(MVT::i1, TheRecord->getName());
     break;
   case NodeType::Arg0:
     MadeChange |= N->updateNodeType(N->getChild(0)->getType(),


Index: llvm/utils/TableGen/InstrSelectorEmitter.h
diff -u llvm/utils/TableGen/InstrSelectorEmitter.h:1.17 llvm/utils/TableGen/InstrSelectorEmitter.h:1.18
--- llvm/utils/TableGen/InstrSelectorEmitter.h:1.17	Mon Aug 11 16:28:59 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.h	Mon Aug 11 23:12:42 2003
@@ -25,8 +25,7 @@
     Arg0,           // Value matches the type of Arg0
     Arg1,           // Value matches the type of Arg1
     Ptr,            // Tree node is the type of the target pointer
-
-    // Return types
+    Bool,           // Always bool
     Void,           // Tree node always returns void
   };
 




From lattner at cs.uiuc.edu  Mon Aug 11 23:18:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 23:18:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Target.td
Message-ID: <200308120417.XAA10539@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

Target.td updated: 1.20 -> 1.21

---
Log message:

Add support for basicblocks, setCC instructions, and branches


---
Diffs of the changes:

Index: llvm/lib/Target/Target.td
diff -u llvm/lib/Target/Target.td:1.20 llvm/lib/Target/Target.td:1.21
--- llvm/lib/Target/Target.td:1.20	Mon Aug 11 16:29:40 2003
+++ llvm/lib/Target/Target.td	Mon Aug 11 23:17:29 2003
@@ -161,6 +161,7 @@
 def DNVT_arg0  : DagNodeValType;  // Tree node returns same type as Arg0
 def DNVT_arg1  : DagNodeValType;  // Tree node returns same type as Arg1
 def DNVT_ptr   : DagNodeValType;  // The target pointer type
+def DNVT_bool  : DagNodeValType;  // Always returns bool
 
 class DagNode<DagNodeValType ret, list<DagNodeValType> args> {
   DagNodeValType RetType = ret;
@@ -179,8 +180,9 @@
 def set     : DagNode<DNVT_void, [DNVT_val, DNVT_arg0]>;
 
 // Terminals...
-def imm : BuiltinDagNode<DNVT_val, [], "Constant">;
-def frameidx : BuiltinDagNode<DNVT_ptr, [], "FrameIndex">;
+def imm        : BuiltinDagNode<DNVT_val, [], "Constant">;
+def frameidx   : BuiltinDagNode<DNVT_ptr, [], "FrameIndex">;
+def basicblock : BuiltinDagNode<DNVT_ptr, [], "BasicBlock">;
 
 // Arithmetic...
 def plus    : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Plus">;
@@ -194,6 +196,13 @@
 def or      : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Or">;
 def xor     : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Xor">;
 
+// Comparisons...
+def seteq   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetEQ">;
+def setne   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetNE">;
+def setlt   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetLT">;
+def setle   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetLE">;
+def setgt   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetGT">;
+def setge   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetGE">;
 
 def load    : BuiltinDagNode<DNVT_val, [DNVT_ptr], "Load">;
 //def store   : BuiltinDagNode<DNVT_Void, [DNVT_ptr, DNVT_val]>;
@@ -201,6 +210,9 @@
 // Other...
 def ret     : BuiltinDagNode<DNVT_void, [DNVT_val], "Ret">;
 def retvoid : BuiltinDagNode<DNVT_void, [], "RetVoid">;
+def br      : BuiltinDagNode<DNVT_void, [DNVT_ptr], "Br">;
+def brcond  : BuiltinDagNode<DNVT_void, [DNVT_bool, DNVT_ptr, DNVT_ptr],
+                             "BrCond">;
 
 //===----------------------------------------------------------------------===//
 // DAG nonterminals definitions used by the instruction selector...




From lattner at cs.uiuc.edu  Mon Aug 11 23:29:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 23:29:00 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp InstrSelectorEmitter.h
Message-ID: <200308120428.XAA11029@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.28 -> 1.29
InstrSelectorEmitter.h updated: 1.18 -> 1.19

---
Log message:

Rename DNVT_bool to DNVT_i1 to be consistent with type system


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.28 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.29
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.28	Mon Aug 11 23:12:42 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 23:28:03 2003
@@ -19,7 +19,7 @@
   if (Name == "DNVT_arg0") return Arg0;
   if (Name == "DNVT_arg1") return Arg1;
   if (Name == "DNVT_ptr" ) return Ptr;
-  if (Name == "DNVT_bool") return Bool;
+  if (Name == "DNVT_i8"  ) return I8;
   throw "Unknown DagNodeValType '" + Name + "'!";
 }
 
@@ -276,7 +276,7 @@
     AnyUnset |= InferTypes(Child, MadeChange);
 
     switch (NT.ArgTypes[i]) {
-    case NodeType::Bool:
+    case NodeType::I8:
       MadeChange |= Child->updateNodeType(MVT::i1, TheRecord->getName());
       break;
     case NodeType::Arg0:
@@ -304,7 +304,7 @@
   case NodeType::Void:
     MadeChange |= N->updateNodeType(MVT::isVoid, TheRecord->getName());
     break;
-  case NodeType::Bool:
+  case NodeType::I8:
     MadeChange |= N->updateNodeType(MVT::i1, TheRecord->getName());
     break;
   case NodeType::Arg0:


Index: llvm/utils/TableGen/InstrSelectorEmitter.h
diff -u llvm/utils/TableGen/InstrSelectorEmitter.h:1.18 llvm/utils/TableGen/InstrSelectorEmitter.h:1.19
--- llvm/utils/TableGen/InstrSelectorEmitter.h:1.18	Mon Aug 11 23:12:42 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.h	Mon Aug 11 23:28:03 2003
@@ -25,7 +25,7 @@
     Arg0,           // Value matches the type of Arg0
     Arg1,           // Value matches the type of Arg1
     Ptr,            // Tree node is the type of the target pointer
-    Bool,           // Always bool
+    I8,             // Always bool
     Void,           // Tree node always returns void
   };
 




From lattner at cs.uiuc.edu  Mon Aug 11 23:29:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 23:29:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Target.td
Message-ID: <200308120428.XAA11069@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

Target.td updated: 1.21 -> 1.22

---
Log message:

Rename DNVT_bool to DNVT_i1 to be consistent with type system



---
Diffs of the changes:

Index: llvm/lib/Target/Target.td
diff -u llvm/lib/Target/Target.td:1.21 llvm/lib/Target/Target.td:1.22
--- llvm/lib/Target/Target.td:1.21	Mon Aug 11 23:17:29 2003
+++ llvm/lib/Target/Target.td	Mon Aug 11 23:28:21 2003
@@ -161,7 +161,7 @@
 def DNVT_arg0  : DagNodeValType;  // Tree node returns same type as Arg0
 def DNVT_arg1  : DagNodeValType;  // Tree node returns same type as Arg1
 def DNVT_ptr   : DagNodeValType;  // The target pointer type
-def DNVT_bool  : DagNodeValType;  // Always returns bool
+def DNVT_i8    : DagNodeValType;  // Always have an i8 value
 
 class DagNode<DagNodeValType ret, list<DagNodeValType> args> {
   DagNodeValType RetType = ret;
@@ -197,12 +197,12 @@
 def xor     : BuiltinDagNode<DNVT_arg0, [DNVT_arg1, DNVT_arg0], "Xor">;
 
 // Comparisons...
-def seteq   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetEQ">;
-def setne   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetNE">;
-def setlt   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetLT">;
-def setle   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetLE">;
-def setgt   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetGT">;
-def setge   : BuiltinDagNode<DNVT_bool, [DNVT_arg1, DNVT_arg0], "SetGE">;
+def seteq   : BuiltinDagNode<DNVT_i8  , [DNVT_arg1, DNVT_arg0], "SetEQ">;
+def setne   : BuiltinDagNode<DNVT_i8  , [DNVT_arg1, DNVT_arg0], "SetNE">;
+def setlt   : BuiltinDagNode<DNVT_i8  , [DNVT_arg1, DNVT_arg0], "SetLT">;
+def setle   : BuiltinDagNode<DNVT_i8  , [DNVT_arg1, DNVT_arg0], "SetLE">;
+def setgt   : BuiltinDagNode<DNVT_i8  , [DNVT_arg1, DNVT_arg0], "SetGT">;
+def setge   : BuiltinDagNode<DNVT_i8  , [DNVT_arg1, DNVT_arg0], "SetGE">;
 
 def load    : BuiltinDagNode<DNVT_val, [DNVT_ptr], "Load">;
 //def store   : BuiltinDagNode<DNVT_Void, [DNVT_ptr, DNVT_val]>;
@@ -211,7 +211,7 @@
 def ret     : BuiltinDagNode<DNVT_void, [DNVT_val], "Ret">;
 def retvoid : BuiltinDagNode<DNVT_void, [], "RetVoid">;
 def br      : BuiltinDagNode<DNVT_void, [DNVT_ptr], "Br">;
-def brcond  : BuiltinDagNode<DNVT_void, [DNVT_bool, DNVT_ptr, DNVT_ptr],
+def brcond  : BuiltinDagNode<DNVT_void, [DNVT_i8, DNVT_ptr, DNVT_ptr],
                              "BrCond">;
 
 //===----------------------------------------------------------------------===//




From lattner at cs.uiuc.edu  Mon Aug 11 23:57:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Aug 11 23:57:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp InstrSelectorEmitter.h
Message-ID: <200308120456.XAA14259@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.29 -> 1.30
InstrSelectorEmitter.h updated: 1.19 -> 1.20

---
Log message:

Add support for the Any type.  Minor fixes and enhancements for BasicBlock operands


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.29 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.30
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.29	Mon Aug 11 23:28:03 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Mon Aug 11 23:56:42 2003
@@ -14,6 +14,7 @@
 
 NodeType::ArgResultTypes NodeType::Translate(Record *R) {
   const std::string &Name = R->getName();
+  if (Name == "DNVT_any")  return Any;
   if (Name == "DNVT_void") return Void;
   if (Name == "DNVT_val" ) return Val;
   if (Name == "DNVT_arg0") return Arg0;
@@ -204,6 +205,8 @@
       New = new TreePatternNode(DI);
       // If it's a regclass or something else known, set the type.
       New->setType(getIntrinsicType(DI->getDef()));
+    } else if (DagInit *DI = dynamic_cast<DagInit*>(Arg)) {
+      New = ParseTreePattern(DI);
     } else {
       Arg->dump();
       error("Unknown leaf value for tree pattern!");
@@ -276,6 +279,7 @@
     AnyUnset |= InferTypes(Child, MadeChange);
 
     switch (NT.ArgTypes[i]) {
+    case NodeType::Any: break;
     case NodeType::I8:
       MadeChange |= Child->updateNodeType(MVT::i1, TheRecord->getName());
       break;
@@ -301,6 +305,7 @@
 
   // See if we can infer anything about the return type now...
   switch (NT.ResultType) {
+  case NodeType::Any: break;
   case NodeType::Void:
     MadeChange |= N->updateNodeType(MVT::isVoid, TheRecord->getName());
     break;
@@ -867,9 +872,10 @@
                                                 std::ostream &OS) {
   if (DefInit *DI = dynamic_cast<DefInit*>(Arg)) {
     Record *Arg = DI->getDef();
-    if (!ArgDeclNode->isLeaf())
+    if (!ArgDeclNode->isLeaf() && ArgDeclNode->getNumChildren() != 0)
       P->error("Expected leaf node as argument!");
-    Record *ArgDecl = ArgDeclNode->getValueRecord();
+    Record *ArgDecl = ArgDeclNode->isLeaf() ? ArgDeclNode->getValueRecord() :
+                      ArgDeclNode->getOperator();
     if (Arg->isSubClassOf("Register")) {
       // This is a physical register reference... make sure that the instruction
       // requested a register!
@@ -896,6 +902,10 @@
       if (!PrintArg) P->error("Cannot define a new frameidx value!");
       OS << ".addFrameIndex(" << NameVar << ")";
       return;
+    } else if (Arg->getName() == "basicblock") {
+      if (!PrintArg) P->error("Cannot define a new basicblock value!");
+      OS << ".addMBB(" << NameVar << ")";
+      return;
     }
     P->error("Unknown operand type '" + Arg->getName() + "' to expander!");
   } else if (IntInit *II = dynamic_cast<IntInit*>(Arg)) {
@@ -910,7 +920,7 @@
     } else {
       if (ArgDeclNode->isLeaf() || ArgDeclNode->getOperator()->getName()!="imm")
         P->error("Illegal immediate int value '" + itostr(II->getValue()) +
-               "' operand!");
+                 "' operand!");
       OS << ".addZImm(" << II->getValue() << ")";
     }
     return;
@@ -1213,7 +1223,8 @@
           for (unsigned IN = 0, e = Insts->getSize(); IN != e; ++IN) {
             DagInit *DIInst = dynamic_cast<DagInit*>(Insts->getElement(IN));
             if (!DIInst) P->error("Result list must contain instructions!");
-            Pattern *InstPat = getPattern(DIInst->getNodeType());
+            Record *InstRec  = DIInst->getNodeType();
+            Pattern *InstPat = getPattern(InstRec);
             if (!InstPat || InstPat->getPatternType() != Pattern::Instruction)
               P->error("Instruction list must contain Instruction patterns!");
             
@@ -1225,10 +1236,10 @@
 
             // Start emission of the instruction...
             OS << "    BuildMI(MBB, " << Target.getName() << "::"
-               << InstPat->getRecord()->getName() << ", "
+               << InstRec->getName() << ", "
                << DIInst->getNumArgs()-hasResult;
             // Emit register result if necessary..
-            if (Record *R = InstPat->getResult()) {
+            if (hasResult) {
               std::string ArgNameVal =
                 getArgName(P, DIInst->getArgName(0), Operands);
               PrintExpanderOperand(DIInst->getArg(0), ArgNameVal,


Index: llvm/utils/TableGen/InstrSelectorEmitter.h
diff -u llvm/utils/TableGen/InstrSelectorEmitter.h:1.19 llvm/utils/TableGen/InstrSelectorEmitter.h:1.20
--- llvm/utils/TableGen/InstrSelectorEmitter.h:1.19	Mon Aug 11 23:28:03 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.h	Mon Aug 11 23:56:42 2003
@@ -20,7 +20,7 @@
 ///
 struct NodeType {
   enum ArgResultTypes {
-    // Both argument and return types...
+    Any,            // No constraint on type
     Val,            // A non-void type
     Arg0,           // Value matches the type of Arg0
     Arg1,           // Value matches the type of Arg1




From lattner at cs.uiuc.edu  Tue Aug 12 00:12:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 00:12:00 2003
Subject: [llvm-commits] CVS: llvm/utils/getsrcs.sh
Message-ID: <200308120511.AAA14863@apoc.cs.uiuc.edu>


Changes in directory llvm/utils:

getsrcs.sh updated: 1.8 -> 1.9

---
Log message:

Make LOC count more accurate by not including the tablegen lexer/parser, any .inc files, which are generated by tablegen, nor .lo files which sometimes get picked up from libtool


---
Diffs of the changes:

Index: llvm/utils/getsrcs.sh
diff -u llvm/utils/getsrcs.sh:1.8 llvm/utils/getsrcs.sh:1.9
--- llvm/utils/getsrcs.sh:1.8	Wed Dec 11 21:44:42 2002
+++ llvm/utils/getsrcs.sh	Tue Aug 12 00:11:12 2003
@@ -1,5 +1,10 @@
 #!/bin/sh
 # This is useful because it prints out all of the source files.  Useful for
 # greps.
-find www include lib tools utils -name \*.\[cdhyl\]\* | grep -v Lexer.cpp | grep -v llvmAsmParser.cpp | grep -v llvmAsmParser.h | grep -v '~$' | grep -v '\.ll$' | grep -v .flc | grep -v Sparc.burm.c | grep -v '\.d$' | grep -v '\.dir$' | grep -v www/docs/doxygen | grep -v include/boost | grep -v /Burg/
+find www include lib tools utils -name \*.\[cdhyl\]\* | grep -v Lexer.cpp | \
+       grep -v llvmAsmParser.cpp | grep -v llvmAsmParser.h | grep -v '~$' | \
+       grep -v '\.ll$' | grep -v .flc | grep -v Sparc.burm.c | grep -v '\.d$' |\
+       grep -v '\.dir$' | grep -v www/docs/doxygen | grep -v include/boost | \
+       grep -v /Burg/ | grep -v '\.lo' | grep -v '\.inc$' | \
+       grep -v TableGen/FileParser.cpp | grep -v TableGen/FileParser.h
 




From lattner at cs.uiuc.edu  Tue Aug 12 00:20:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 00:20:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp
Message-ID: <200308120519.AAA16482@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.30 -> 1.31

---
Log message:

Fix emission of instructions that directly reference MBBs


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.30 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.31
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.30	Mon Aug 11 23:56:42 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Tue Aug 12 00:19:49 2003
@@ -1205,15 +1205,21 @@
           if (P->getResult()) OS << ", NewReg";
           OS << ")";
 
-          for (unsigned i = 0, e = Operands.size(); i != e; ++i)
-            if (Operands[i].first->isLeaf()) {
-              Record *RV = Operands[i].first->getValueRecord();
+          for (unsigned i = 0, e = Operands.size(); i != e; ++i) {
+            TreePatternNode *Op = Operands[i].first;
+            if (Op->isLeaf()) {
+              Record *RV = Op->getValueRecord();
               assert(RV->isSubClassOf("RegisterClass") &&
                      "Only handles registers here so far!");
               OS << ".addReg(" << Operands[i].second << "->Val)";
-            } else {
+            } else if (Op->getOperator()->getName() == "imm") {
               OS << ".addZImm(" << Operands[i].second << "->Val)";
+            } else if (Op->getOperator()->getName() == "basicblock") {
+              OS << ".addMBB(" << Operands[i].second << "->Val)";
+            } else {
+              assert(0 && "Unknown value type!");
             }
+          }
           OS << ";\n";
           break;
         case Pattern::Expander: {




From lattner at cs.uiuc.edu  Tue Aug 12 09:59:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 09:59:00 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
Message-ID: <200308121458.JAA18638@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

2003-08-12-AllocaNonNull.ll added (r1.1)

---
Log message:

Testcase for feature we should support eventually


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll
diff -c /dev/null llvm/test/Regression/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll:1.1
*** /dev/null	Tue Aug 12 09:58:18 2003
--- llvm/test/Regression/Transforms/InstCombine/2003-08-12-AllocaNonNull.ll	Tue Aug 12 09:58:08 2003
***************
*** 0 ****
--- 1,22 ----
+ ; This testcase can be simplified by "realizing" that alloca can never return 
+ ; null.
+ ; RUN: as < %s | opt -instcombine -simplifycfg | dis | not grep 'br '
+ 
+ implementation   ; Functions:
+ 
+ declare int %bitmap_clear(...)
+ 
+ int %oof() {
+ entry:
+         %live_head = alloca int         ; <int*> [#uses=2]
+         %tmp.1 = setne int* %live_head, null            ; <bool> [#uses=1]
+         br bool %tmp.1, label %then, label %UnifiedExitNode
+ 
+ then:
+         %tmp.4 = call int (...)* %bitmap_clear( int* %live_head )              ; <int> [#uses=0]
+         br label %UnifiedExitNode
+ 
+ UnifiedExitNode:
+         ret int 0
+ }
+ 




From criswell at cs.uiuc.edu  Tue Aug 12 10:03:02 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Aug 12 10:03:02 2003
Subject: [llvm-commits] CVS: poolalloc/LICENSE.TXT
Message-ID: <200308121502.KAA07459@choi.cs.uiuc.edu>


Changes in directory poolalloc:

LICENSE.TXT added (r1.1)

---
Log message:

Adding the license for the pre-release of the automatic pool allocation.



---
Diffs of the changes:

Index: poolalloc/LICENSE.TXT
diff -c /dev/null poolalloc/LICENSE.TXT:1.1
*** /dev/null	Tue Aug 12 10:02:45 2003
--- poolalloc/LICENSE.TXT	Tue Aug 12 10:02:35 2003
***************
*** 0 ****
--- 1,31 ----
+ LLVM Automatic Pool Allocation Transformation pre-release license:
+ 
+ This is a pre-release version of the Automatic Pool Allocation
+ transformation, a component of the LLVM Compiler Infrastructure.  The
+ entire LLVM Infrastructure (including the Automatic Pool Allocation
+ transformation) is covered by the license terms below.  In addition,
+ note that the Automatic Pool Allocation Transformation is being provided
+ separately, strictly for internal use, and will not be included in
+ initial public distributions of the LLVM infrastructure.  This version
+ of the transformation code may not be distributed to third parties, even
+ after the LLVM Infrastructure is released in the public domain.
+ 
+ LLVM pre-release license:
+ 
+ This is a pre-release distribution of the LLVM software and is provided for
+ evaluation only.  This version of the LLVM software or modifications thereof
+ should not be distributed to third parties for any purpose.  Any third parties
+ interested in it can request a copy directly by sending e-mail to
+ llvmdev at cs.uiuc.edu.  As this is an evaluation release, we would appreciate any
+ and all feedback, ideas, and reports of bugs that you encounter.  These can be
+ submitted through the llvmbugs at cs.uiuc.edu or llvmdev at cs.uiuc.edu mailing lists
+ as appropriate.  We thank you for your interest in LLVM and look forward to any
+ comments or feedback you may have.
+ 
+ THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+ CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE
+ SOFTWARE.




From vadve at cs.uiuc.edu  Tue Aug 12 10:52:01 2003
From: vadve at cs.uiuc.edu (Vikram Adve)
Date: Tue Aug 12 10:52:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/Sparc.cpp
Message-ID: <200308121551.KAA00696@psmith.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

Sparc.cpp updated: 1.73 -> 1.74

---
Log message:

Disable emitting LLVM-to-MI maps, by default.
Add -emitmaps options to turn this back on.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/Sparc.cpp
diff -u llvm/lib/Target/Sparc/Sparc.cpp:1.73 llvm/lib/Target/Sparc/Sparc.cpp:1.74
--- llvm/lib/Target/Sparc/Sparc.cpp:1.73	Wed Aug  6 18:25:25 2003
+++ llvm/lib/Target/Sparc/Sparc.cpp	Tue Aug 12 10:51:02 2003
@@ -47,13 +47,15 @@
 static cl::opt<bool> DisablePeephole("disable-peephole",
                                 cl::desc("Disable peephole optimization pass"));
 
-static cl::opt<bool>
-DisableStrip("disable-strip",
-	  cl::desc("Do not strip the LLVM bytecode included in the executable"));
-
-static cl::opt<bool>
-DumpInput("dump-input",cl::desc("Print bytecode before native code generation"),
-          cl::Hidden);
+static cl::opt<bool> EmitMappingInfo("emitmaps",
+             cl::desc("Emit LLVM-to-MachineCode mapping info to assembly"));
+
+static cl::opt<bool> DisableStrip("disable-strip",
+	     cl::desc("Do not strip the LLVM bytecode included in executable"));
+
+static cl::opt<bool> DumpInput("dump-input",
+                      cl::desc("Print bytecode before native code generation"),
+                      cl::Hidden);
 
 //----------------------------------------------------------------------------
 // allocateSparcTargetMachine - Allocate and return a subclass of TargetMachine
@@ -197,7 +199,8 @@
   if (!DisablePeephole)
     PM.add(createPeepholeOptsPass(*this));
 
-  PM.add(getMappingInfoCollector(Out));  
+  if (EmitMappingInfo)
+    PM.add(getMappingInfoCollector(Out));  
 
   // Output assembly language to the .s file.  Assembly emission is split into
   // two parts: Function output and Global value output.  This is because
@@ -212,8 +215,11 @@
   PM.add(getModuleAsmPrinterPass(Out));
 
   // Emit bytecode to the assembly file into its special section next
-  PM.add(getEmitBytecodeToAsmPass(Out));
-  PM.add(getFunctionInfo(Out)); 
+  if (EmitMappingInfo) {
+    PM.add(getEmitBytecodeToAsmPass(Out));
+    PM.add(getFunctionInfo(Out)); 
+  }
+
   return false;
 }
 




From criswell at cs.uiuc.edu  Tue Aug 12 11:00:03 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Aug 12 11:00:03 2003
Subject: [llvm-commits] CVS: poolalloc/README
Message-ID: <200308121559.KAA14380@choi.cs.uiuc.edu>


Changes in directory poolalloc:

README added (r1.1)

---
Log message:

README and installation directions for the Pool Allocator.



---
Diffs of the changes:

Index: poolalloc/README
diff -c /dev/null poolalloc/README:1.1
*** /dev/null	Tue Aug 12 10:59:46 2003
--- poolalloc/README	Tue Aug 12 10:59:36 2003
***************
*** 0 ****
--- 1,72 ----
+ Welcome to the Pre-Release of the Automatic Pool Allocator!
+ 
+ LICENSE:
+ ========
+ Before using the Automatic Pool Allocator, you should read the pre-release
+ license in LICENSE.TXT.
+ 
+ BUILDING:
+ =========
+ To build the Automatic Pool Allocator, you will need to have installed and
+ compiled LLVM.
+ 
+ Once that is done, you can build the Automatic Pool Allocator using the
+ following steps:
+ 
+ 	1. Run the configure script to tell the build system LLVM has been
+ 	   installed.  Use the --with-llvmsrc=<dir> option to specify the
+ 	   location of the LLVM source code, and use the --with-llvmobj=<dir>
+ 	   option to specify the location of the LLVM object code.
+ 
+ 	   For example, if the user joe with home directory of /usr/home/joe
+ 	   has the LLVM source in /usr/home/joe/llvm, and it was configured
+ 	   with ./configure --with-objroot=/tmp, then the Automatic Pool
+ 	   Allocator should be configured with:
+ 
+ 	   > ./configure --with-llvmsrc=/usr/home/joe/llvm \
+ 	                 --with-llvmobj=/tmp/llvm
+ 
+ 	2. Using GNU Make (sometimes called gmake), type "make" to build the
+ 	   Automatic Pool Allocator:
+ 
+ 	   > make
+ 
+ 	3. To install the pool allocator bytecode libraries into the C front
+ 	   end, use make with the install target:
+ 
+ 	   > make install
+ 
+ USING THE POOL ALLOCATOR:
+ =========================
+ 
+ To use the Automatic Pool Allocator optimization pass, you will need to
+ explicitly load it into the opt program:
+ 
+ 	> opt -load <path to pool allocator> -poolalloc <other opt options>
+ 
+ To link and run programs with the pool allocator, you will need to have the
+ poolalloc bytecode library in your LLVM_LIB_SEARCH_PATH.  If you have followed
+ the directions in the "Getting Started Guide" for LLVM, your
+ LLVM_LIB_SEARCH_PATH environment variable already points to the C front end's
+ directory of bytecode libraries.  Just use the install target (mentioned above)
+ of make to install the poolalloc library into that directory.
+ 
+ To link a bytecode file once it has been optimized, you can do the following:
+ 
+ 	> llvmgcc -o <output file> <optimized bytecode file> -lpoolalloc
+ 
+ ...where llvmgcc is an alias to the GCC C front end.
+ 
+ This will generate a bytecode file that can be executed.
+ 
+ BUGS:
+ =====
+ Please see our website for information on how to report bugs
+ (http://llvm.cs.uiuc.edu/docs/HowToSubmitABug.html).
+ 
+ LLVM DEVELOPER'S MAILING LIST
+ =============================
+ The LLVM Developer's Mailing List provides announcements and general discussion
+ about LLVM.  The list is low volume.  You can subscribe to it at
+ http://mail.cs.uiuc.edu/mailman/listinfo/llvmdev.
+ 




From criswell at cs.uiuc.edu  Tue Aug 12 11:01:00 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Aug 12 11:01:00 2003
Subject: [llvm-commits] CVS: poolalloc/Makefile
Message-ID: <200308121600.LAA14496@choi.cs.uiuc.edu>


Changes in directory poolalloc:

Makefile updated: 1.1.1.1 -> 1.2

---
Log message:

Added the distclean target.



---
Diffs of the changes:

Index: poolalloc/Makefile
diff -u poolalloc/Makefile:1.1.1.1 poolalloc/Makefile:1.2
--- poolalloc/Makefile:1.1.1.1	Mon Aug 11 16:29:15 2003
+++ poolalloc/Makefile	Tue Aug 12 11:00:47 2003
@@ -24,3 +24,6 @@
 #
 include $(LEVEL)/Makefile.common
 
+distclean:: clean
+	${RM} -f Makefile.common Makefile.config
+




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 12:23:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 12:23:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Pass.cpp
Message-ID: <200308121722.h7CHMmj17044@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Pass.cpp updated: 1.43 -> 1.44

---
Log message:

Add FunctionPassManager - it's like a PassManager, but it only deals in
FunctionPasses.


---
Diffs of the changes:

Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.43 llvm/lib/VMCore/Pass.cpp:1.44
--- llvm/lib/VMCore/Pass.cpp:1.43	Mon Jun 30 16:58:54 2003
+++ llvm/lib/VMCore/Pass.cpp	Tue Aug 12 12:22:37 2003
@@ -70,6 +70,16 @@
 void PassManager::add(Pass *P) { PM->add(P); }
 bool PassManager::run(Module &M) { return PM->run(M); }
 
+//===----------------------------------------------------------------------===//
+// FunctionPassManager implementation - The FunctionPassManager class
+// is a simple Pimpl class that wraps the PassManagerT template. It
+// is like PassManager, but only deals in FunctionPasses.
+//
+FunctionPassManager::FunctionPassManager() : PM(new PassManagerT<Function>()) {}
+FunctionPassManager::~FunctionPassManager() { delete PM; }
+void FunctionPassManager::add(FunctionPass *P) { PM->add(P); }
+bool FunctionPassManager::run(Function &F) { return PM->run(F); }
+
 
 //===----------------------------------------------------------------------===//
 // TimingInfo Class - This class is used to calculate information about the




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 12:23:05 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 12:23:05 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/PassManager.h
Message-ID: <200308121722.h7CHMnn17052@niobe.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

PassManager.h updated: 1.4 -> 1.5

---
Log message:

Add FunctionPassManager - it's like a PassManager, but it only deals in
FunctionPasses.


---
Diffs of the changes:

Index: llvm/include/llvm/PassManager.h
diff -u llvm/include/llvm/PassManager.h:1.4 llvm/include/llvm/PassManager.h:1.5
--- llvm/include/llvm/PassManager.h:1.4	Tue May 20 13:39:06 2003
+++ llvm/include/llvm/PassManager.h	Tue Aug 12 12:22:39 2003
@@ -28,9 +28,33 @@
   void add(Pass *P);
 
   /// run - Execute all of the passes scheduled for execution.  Keep track of
-  /// whether any of the functions modifies the program, and if so, return true.
+  /// whether any of the passes modifies the module, and if so, return true.
   ///
   bool run(Module &M);
+};
+
+class FunctionPass;
+class Function;
+
+class FunctionPassManager {
+  PassManagerT<Function> *PM;    // This is a straightforward Pimpl class
+public:
+  FunctionPassManager();
+  ~FunctionPassManager();
+
+  /// add - Add a pass to the queue of passes to run.  This passes
+  /// ownership of the FunctionPass to the PassManager.  When the
+  /// PassManager is destroyed, the pass will be destroyed as well, so
+  /// there is no need to delete the pass.  This implies that all
+  /// passes MUST be allocated with 'new'.
+  ///
+  void add(FunctionPass *P);
+
+  /// run - Execute all of the passes scheduled for execution.  Keep
+  /// track of whether any of the passes modifies the function, and if
+  /// so, return true.
+  ///
+  bool run(Function &M);
 };
 
 #endif




From criswell at cs.uiuc.edu  Tue Aug 12 13:18:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Aug 12 13:18:01 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
Message-ID: <200308121817.NAA27125@choi.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.16 -> 1.17

---
Log message:

Merged in a changes from the LLVM tree: Revision 1.16
Bug fix: Some nodes pointed to by globals may not be marked incomplete and need 
to be tracked to find pool arguments.



---
Diffs of the changes:

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.16 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.17
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.16	Mon Aug 11 17:07:11 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Tue Aug 12 13:17:29 2003
@@ -254,14 +254,27 @@
 
 void PoolAllocate::FindFunctionPoolArgs(Function &F) {
 
-  // The DSGraph is merged with the globals graph. 
   DSGraph &G = BU->getDSGraph(F);
-  G.mergeInGlobalsGraph();
-
+ 
   // Inline the potential targets of indirect calls
   hash_set<Function*> visitedFuncs;
   InlineIndirectCalls(F, G, visitedFuncs);
 
+  // The DSGraph is merged with the globals graph. 
+  G.mergeInGlobalsGraph();
+
+  // The nodes reachable from globals need to be recognized as potential 
+  // arguments. This is required because, upon merging in the globals graph,
+  // the nodes pointed to by globals that are not live are not marked 
+  // incomplete.
+  hash_set<DSNode*> NodesFromGlobals;
+  for (DSGraph::ScalarMapTy::iterator I = G.getScalarMap().begin(), 
+	 E = G.getScalarMap().end(); I != E; ++I)
+    if (isa<GlobalValue>(I->first)) {             // Found a global
+      DSNodeHandle &GH = I->second;
+      GH.getNode()->markReachableNodes(NodesFromGlobals);
+    }
+
   // At this point the DS Graphs have been modified in place including
   // information about globals as well as indirect calls, making it useful
   // for pool allocation
@@ -296,8 +309,8 @@
     for (unsigned i = 0, e = Nodes.size(); i != e; ++i) {
       if (Nodes[i]->isGlobalNode() && !Nodes[i]->isIncomplete())
         DEBUG(std::cerr << "Global node is not Incomplete\n");
-      if ((Nodes[i]->isIncomplete() || Nodes[i]->isGlobalNode()) && 
-	  Nodes[i]->isHeapNode())
+      if ((Nodes[i]->isIncomplete() || Nodes[i]->isGlobalNode() || 
+	   NodesFromGlobals.count(Nodes[i])) && Nodes[i]->isHeapNode())
         Nodes[i]->markReachableNodes(MarkedNodes);
     }
 




From criswell at cs.uiuc.edu  Tue Aug 12 13:52:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Aug 12 13:52:01 2003
Subject: [llvm-commits] CVS: llvm/Makefile Makefile.common
Message-ID: <200308121851.NAA31883@choi.cs.uiuc.edu>


Changes in directory llvm:

Makefile updated: 1.4 -> 1.5
Makefile.common updated: 1.109 -> 1.110

---
Log message:

Merged in changes between PRE11_ROOT and LLVM_PRE111 (i.e. the beginning of
the pre-release 1.1 branch and pre-release 1.1.1).
Made the USE_SPEC option work.
Silenced unnecessary error output from the cmp command when checking for
updates to lex/yacc generated files.  This fixes a problem where we get error
messages the first time the file is generated.
Fixed the distclean option.  It is now in the Makefile (i.e. only runs in the
top level source directory), removes more files, and plays nicely with
external project Makefiles.



---
Diffs of the changes:

Index: llvm/Makefile
diff -u llvm/Makefile:1.4 llvm/Makefile:1.5
--- llvm/Makefile:1.4	Wed Jun 11 08:55:26 2003
+++ llvm/Makefile	Tue Aug 12 13:51:48 2003
@@ -6,3 +6,11 @@
 
 test :: all
 	cd test; $(MAKE)
+
+distclean:: clean
+	$(VERB) $(RM) -rf $(LEVEL)/Makefile.config \
+	                  $(LEVEL)/include/Config/config.h \
+	                  $(LEVEL)/autoconf/autom4te.cache \
+	                  $(LEVEL)/config.log \
+	                  $(LEVEL)/TAGS
+


Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.109 llvm/Makefile.common:1.110
--- llvm/Makefile.common:1.109	Wed Aug  6 16:44:22 2003
+++ llvm/Makefile.common	Tue Aug 12 13:51:48 2003
@@ -727,7 +727,7 @@
           $(SED) 's/void \*yy_flex_realloc/inline void *yy_flex_realloc/' | \
           $(SED) 's/#define YY_BUF_SIZE 16384/#define YY_BUF_SIZE (16384*64)/' \
               > $@.tmp
-	$(VERB) cmp $@ $@.tmp > /dev/null || ${MV} -f $@.tmp $@
+	$(VERB) cmp -s $@ $@.tmp > /dev/null || ${MV} -f $@.tmp $@
 	@# remove the output of flex if it didn't get moved over...
 	@rm -f $@.tmp
 
@@ -737,8 +737,8 @@
 %.cpp %.h : %.y
 	@echo Bison\'ing $<...
 	$(VERB) $(BISON) -v -d -p $(<:%Parser.y=%) $*.y
-	$(VERB) cmp $*.tab.c $*.cpp > /dev/null || ${MV} -f $*.tab.c $*.cpp
-	$(VERB) cmp $*.tab.h $*.h > /dev/null || ${MV} -f $*.tab.h $*.h
+	$(VERB) cmp -s $*.tab.c $*.cpp > /dev/null || ${MV} -f $*.tab.c $*.cpp
+	$(VERB) cmp -s $*.tab.h $*.h   > /dev/null || ${MV} -f $*.tab.h $*.h
 	@# If the files were not updated, don't leave them lying around...
 	@rm -f $*.tab.c $*.tab.h
 
@@ -762,12 +762,6 @@
 	$(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
 	$(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT)
 
-distclean:: clean
-	$(VERB) (cd $(LLVM_SRC_ROOT); $(RM) -rf $(LEVEL)/Makefile.config \
-	            $(LEVEL)/include/Config/config.h \
-	            $(LEVEL)/autom4te.cache \
-	            $(LEVEL)/config.log)
-
 ###########################################################################
 # C/C++ Dependencies
 #	Define variables and rules that generate header file dependencies
@@ -795,7 +789,9 @@
 # are cleaning (this example taken from the GNU Make Manual).
 #
 ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(MAKECMDGOALS),distclean)
 ifneq ($(SourceDepend),)
 -include $(SourceDepend)
+endif
 endif
 endif




From criswell at cs.uiuc.edu  Tue Aug 12 13:53:00 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Aug 12 13:53:00 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/External/SPEC/Makefile
Message-ID: <200308121852.NAA31892@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs/External/SPEC:

Makefile updated: 1.1 -> 1.2

---
Log message:

Merged in changes between PRE11_ROOT and LLVM_PRE111 (i.e. the beginning of
the pre-release 1.1 branch and pre-release 1.1.1).
Made the USE_SPEC option work.
Silenced unnecessary error output from the cmp command when checking for
updates to lex/yacc generated files.  This fixes a problem where we get error
messages the first time the file is generated.
Fixed the distclean option.  It is now in the Makefile (i.e. only runs in the
top level source directory), removes more files, and plays nicely with
external project Makefiles.



---
Diffs of the changes:

Index: llvm/test/Programs/External/SPEC/Makefile
diff -u llvm/test/Programs/External/SPEC/Makefile:1.1 llvm/test/Programs/External/SPEC/Makefile:1.2
--- llvm/test/Programs/External/SPEC/Makefile:1.1	Wed May 14 18:20:53 2003
+++ llvm/test/Programs/External/SPEC/Makefile	Tue Aug 12 13:51:51 2003
@@ -1,3 +1,5 @@
 LEVEL = ../../../..
+ifdef USE_SPEC
 DIRS := $(sort $(filter-out CVS/, $(wildcard */)))
+endif
 include ${LEVEL}/test/Makefile.tests




From lattner at cs.uiuc.edu  Tue Aug 12 14:11:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 14:11:02 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/or.ll
Message-ID: <200308121911.OAA24625@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

or.ll updated: 1.25 -> 1.26

---
Log message:

New testcases


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/or.ll
diff -u llvm/test/Regression/Transforms/InstCombine/or.ll:1.25 llvm/test/Regression/Transforms/InstCombine/or.ll:1.26
--- llvm/test/Regression/Transforms/InstCombine/or.ll:1.25	Thu Jul 24 14:44:51 2003
+++ llvm/test/Regression/Transforms/InstCombine/or.ll	Tue Aug 12 14:10:50 2003
@@ -100,3 +100,16 @@
         ret bool %D
 }
 
+int %test16(int %A) {
+	%B = and int %A, 1
+	%C = and int %A, -2       ; -2 = ~1
+	%D = or int %B, %C        ; %D = and int %B, -1 == %B
+	ret int %D
+}
+
+int %test17(int %A) {
+	%B = and int %A, 1
+	%C = and int %A, 4
+	%D = or int %B, %C        ; %D = and int %B, 5
+	ret int %D
+}




From lattner at cs.uiuc.edu  Tue Aug 12 14:12:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 14:12:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200308121911.OAA24634@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.109 -> 1.110

---
Log message:

Implement testcases InstCombine/or.ll:test16/test17


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.109 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.110
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.109	Thu Jul 24 13:38:56 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Tue Aug 12 14:11:07 2003
@@ -612,6 +612,19 @@
     }
   }
 
+  // (A & C1)|(A & C2) == A & (C1|C2)
+  if (BinaryOperator *BO0 = dyn_cast<BinaryOperator>(Op0))
+    if (BinaryOperator *BO1 = dyn_cast<BinaryOperator>(Op1))
+      if (BO0->getOperand(0) == BO1->getOperand(0) &&
+          BO0->getOpcode() == Instruction::And &&
+          BO1->getOpcode() == Instruction::And)
+        if (ConstantIntegral *C0 =
+            dyn_cast<ConstantIntegral>(BO0->getOperand(1)))
+          if (ConstantIntegral *C1 =
+              dyn_cast<ConstantIntegral>(BO1->getOperand(1)))
+            return BinaryOperator::create(Instruction::And, BO0->getOperand(0),
+                                          *C0 | *C1);            
+
   Value *Op0NotVal = dyn_castNotVal(Op0);
   Value *Op1NotVal = dyn_castNotVal(Op1);
 




From lattner at cs.uiuc.edu  Tue Aug 12 14:18:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 14:18:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200308121917.OAA27675@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.110 -> 1.111

---
Log message:

Simplify code


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.110 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.111
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.110	Tue Aug 12 14:11:07 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Tue Aug 12 14:17:27 2003
@@ -241,7 +241,8 @@
 // dyn_castMaskingAnd - If this value is an And instruction masking a value with
 // a constant, return the constant being anded with.
 //
-static inline Constant *dyn_castMaskingAnd(Value *V) {
+template<class ValueType>
+static inline Constant *dyn_castMaskingAnd(ValueType *V) {
   if (Instruction *I = dyn_cast<Instruction>(V))
     if (I->getOpcode() == Instruction::And)
       return dyn_cast<Constant>(I->getOperand(1));
@@ -613,16 +614,12 @@
   }
 
   // (A & C1)|(A & C2) == A & (C1|C2)
-  if (BinaryOperator *BO0 = dyn_cast<BinaryOperator>(Op0))
-    if (BinaryOperator *BO1 = dyn_cast<BinaryOperator>(Op1))
-      if (BO0->getOperand(0) == BO1->getOperand(0) &&
-          BO0->getOpcode() == Instruction::And &&
-          BO1->getOpcode() == Instruction::And)
-        if (ConstantIntegral *C0 =
-            dyn_cast<ConstantIntegral>(BO0->getOperand(1)))
-          if (ConstantIntegral *C1 =
-              dyn_cast<ConstantIntegral>(BO1->getOperand(1)))
-            return BinaryOperator::create(Instruction::And, BO0->getOperand(0),
+  if (Instruction *LHS = dyn_cast<BinaryOperator>(Op0))
+    if (Instruction *RHS = dyn_cast<BinaryOperator>(Op1))
+      if (LHS->getOperand(0) == RHS->getOperand(0))
+        if (Constant *C0 = dyn_castMaskingAnd(LHS))
+          if (Constant *C1 = dyn_castMaskingAnd(RHS))
+            return BinaryOperator::create(Instruction::And, LHS->getOperand(0),
                                           *C0 | *C1);            
 
   Value *Op0NotVal = dyn_castNotVal(Op0);




From criswell at cs.uiuc.edu  Tue Aug 12 14:44:01 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Aug 12 14:44:01 2003
Subject: [llvm-commits] CVS: poolalloc/README
Message-ID: <200308121943.OAA12775@choi.cs.uiuc.edu>


Changes in directory poolalloc:

README updated: 1.1 -> 1.2

---
Log message:

Added a list of changes from the previous release.



---
Diffs of the changes:

Index: poolalloc/README
diff -u poolalloc/README:1.1 poolalloc/README:1.2
--- poolalloc/README:1.1	Tue Aug 12 10:59:36 2003
+++ poolalloc/README	Tue Aug 12 14:43:13 2003
@@ -38,7 +38,6 @@
 
 USING THE POOL ALLOCATOR:
 =========================
-
 To use the Automatic Pool Allocator optimization pass, you will need to
 explicitly load it into the opt program:
 
@@ -58,6 +57,17 @@
 ...where llvmgcc is an alias to the GCC C front end.
 
 This will generate a bytecode file that can be executed.
+
+CHANGES:
+========
+This pre-release has the following changes:
+
+	- Correctly handles indirect calls
+	- Correctly handles globals
+	- Accepts partially pool allocatable programs
+	- Fixed a large number of bugs
+	- Tested on a number of benchmarks including Olden, Ptrdist, and a few
+	  SPEC codes.
 
 BUGS:
 =====




From criswell at cs.uiuc.edu  Tue Aug 12 14:47:02 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Tue Aug 12 14:47:02 2003
Subject: [llvm-commits] CVS: poolalloc/README
Message-ID: <200308121946.OAA12795@choi.cs.uiuc.edu>


Changes in directory poolalloc:

README updated: 1.2 -> 1.3

---
Log message:

Added a note about how the poolalloc pass is now compiled into a shared object.
Added periods to the end of each change.



---
Diffs of the changes:

Index: poolalloc/README
diff -u poolalloc/README:1.2 poolalloc/README:1.3
--- poolalloc/README:1.2	Tue Aug 12 14:43:13 2003
+++ poolalloc/README	Tue Aug 12 14:46:14 2003
@@ -62,10 +62,13 @@
 ========
 This pre-release has the following changes:
 
-	- Correctly handles indirect calls
-	- Correctly handles globals
-	- Accepts partially pool allocatable programs
-	- Fixed a large number of bugs
+	- Pool Allocator Optimization pass is now separate from LLVM and
+	  compiled into a shared object.  The LLVM utilities do not need to be
+	  recompiled when the pool allocator code is changed.
+	- Correctly handles indirect calls.
+	- Correctly handles globals.
+	- Accepts partially pool allocatable programs.
+	- Fixed a large number of bugs.
 	- Tested on a number of benchmarks including Olden, Ptrdist, and a few
 	  SPEC codes.
 




From lattner at cs.uiuc.edu  Tue Aug 12 15:15:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 15:15:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/Reassociate.cpp
Message-ID: <200308122014.PAA04450@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

Reassociate.cpp updated: 1.19 -> 1.20

---
Log message:

Assign finer grained ranks, make sure to reassociate top-level after reassociating bottom level


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/Reassociate.cpp
diff -u llvm/lib/Transforms/Scalar/Reassociate.cpp:1.19 llvm/lib/Transforms/Scalar/Reassociate.cpp:1.20
--- llvm/lib/Transforms/Scalar/Reassociate.cpp:1.19	Fri Aug  1 17:15:03 2003
+++ llvm/lib/Transforms/Scalar/Reassociate.cpp	Tue Aug 12 15:14:27 2003
@@ -57,20 +57,20 @@
 Pass *createReassociatePass() { return new Reassociate(); }
 
 void Reassociate::BuildRankMap(Function &F) {
-  unsigned i = 1;
+  unsigned i = 2;
   ReversePostOrderTraversal<Function*> RPOT(&F);
   for (ReversePostOrderTraversal<Function*>::rpo_iterator I = RPOT.begin(),
          E = RPOT.end(); I != E; ++I)
-    RankMap[*I] = ++i;
+    RankMap[*I] = ++i << 16;
 }
 
 unsigned Reassociate::getRank(Value *V) {
   if (isa<Argument>(V)) return 1;   // Function argument...
   if (Instruction *I = dyn_cast<Instruction>(V)) {
-    // If this is an expression, return the MAX(rank(LHS), rank(RHS)) so that we
-    // can reassociate expressions for code motion!  Since we do not recurse for
-    // PHI nodes, we cannot have infinite recursion here, because there cannot
-    // be loops in the value graph that do not go through PHI nodes.
+    // If this is an expression, return the 1+MAX(rank(LHS), rank(RHS)) so that
+    // we can reassociate expressions for code motion!  Since we do not recurse
+    // for PHI nodes, we cannot have infinite recursion here, because there
+    // cannot be loops in the value graph that do not go through PHI nodes.
     //
     if (I->getOpcode() == Instruction::PHINode ||
         I->getOpcode() == Instruction::Alloca ||
@@ -87,7 +87,10 @@
          i != e && Rank != MaxRank; ++i)
       Rank = std::max(Rank, getRank(I->getOperand(i)));
 
-    return CachedRank = Rank;
+    DEBUG(std::cerr << "Calculated Rank[" << V->getName() << "] = "
+                    << Rank+1 << "\n");
+
+    return CachedRank = Rank+1;
   }
 
   // Otherwise it's a global or constant, rank 0.
@@ -145,6 +148,7 @@
 
         // Since we modified the RHS instruction, make sure that we recheck it.
         ReassociateExpr(LHSI);
+        ReassociateExpr(I);
         return true;
       }
     }




From lattner at cs.uiuc.edu  Tue Aug 12 15:48:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 15:48:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Support/Debug.cpp
Message-ID: <200308122047.PAA05014@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

Debug.cpp updated: 1.1 -> 1.2

---
Log message:

Reenable optimized build


---
Diffs of the changes:

Index: llvm/lib/Support/Debug.cpp
diff -u llvm/lib/Support/Debug.cpp:1.1 llvm/lib/Support/Debug.cpp:1.2
--- llvm/lib/Support/Debug.cpp:1.1	Fri Aug  1 17:15:41 2003
+++ llvm/lib/Support/Debug.cpp	Tue Aug 12 15:46:50 2003
@@ -49,5 +49,9 @@
 // with the -debug-only=X option.
 //
 bool isCurrentDebugType(const char *DebugType) {
+#ifndef NDEBUG
   return CurrentDebugType.empty() || DebugType == CurrentDebugType;
+#else
+  return false;
+#endif
 }




From lattner at cs.uiuc.edu  Tue Aug 12 16:22:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 16:22:02 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/shift.ll
Message-ID: <200308122120.QAA08020@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

shift.ll updated: 1.10 -> 1.11

---
Log message:

New testcases


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/shift.ll
diff -u llvm/test/Regression/Transforms/InstCombine/shift.ll:1.10 llvm/test/Regression/Transforms/InstCombine/shift.ll:1.11
--- llvm/test/Regression/Transforms/InstCombine/shift.ll:1.10	Thu Jul 24 13:38:09 2003
+++ llvm/test/Regression/Transforms/InstCombine/shift.ll	Tue Aug 12 16:20:49 2003
@@ -80,3 +80,16 @@
 	%C = shl sbyte %B, ubyte 4
 	ret sbyte %C
 }
+
+uint %test14(uint %A) {
+	%B = shr uint %A, ubyte 4
+	%C = or uint %B, 1234
+	%D = shl uint %C, ubyte 4   ;; D = ((B | 1234) << 4) === ((B << 4)|(1234 << 4)
+	ret uint %D
+}
+int %test14a(int %A) {
+	%B = shl int %A, ubyte 4
+	%C = and int %B, -1234
+	%D = shr int %C, ubyte 4   ;; D = ((B | 1234) << 4) === ((B << 4)|(1234 << 4)
+	ret int %D
+}




From lattner at cs.uiuc.edu  Tue Aug 12 16:24:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 16:24:02 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/shift.ll
Message-ID: <200308122123.QAA08057@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

shift.ll updated: 1.11 -> 1.12

---
Log message:

Right, instcombine cannot remove ((X >> C) << C) if it's signed.


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/shift.ll
diff -u llvm/test/Regression/Transforms/InstCombine/shift.ll:1.11 llvm/test/Regression/Transforms/InstCombine/shift.ll:1.12
--- llvm/test/Regression/Transforms/InstCombine/shift.ll:1.11	Tue Aug 12 16:20:49 2003
+++ llvm/test/Regression/Transforms/InstCombine/shift.ll	Tue Aug 12 16:22:51 2003
@@ -87,9 +87,9 @@
 	%D = shl uint %C, ubyte 4   ;; D = ((B | 1234) << 4) === ((B << 4)|(1234 << 4)
 	ret uint %D
 }
-int %test14a(int %A) {
-	%B = shl int %A, ubyte 4
-	%C = and int %B, -1234
-	%D = shr int %C, ubyte 4   ;; D = ((B | 1234) << 4) === ((B << 4)|(1234 << 4)
-	ret int %D
+uint %test14a(uint %A) {
+	%B = shl uint %A, ubyte 4
+	%C = and uint %B, 1234
+	%D = shr uint %C, ubyte 4   ;; D = ((B | 1234) << 4) === ((B << 4)|(1234 << 4)
+	ret uint %D
 }




From lattner at cs.uiuc.edu  Tue Aug 12 16:37:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 16:37:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
Message-ID: <200308122136.QAA10400@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/Reassociate:

2003-08-12-InfiniteLoop.ll added (r1.1)

---
Log message:

new testcase


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll
diff -c /dev/null llvm/test/Regression/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll:1.1
*** /dev/null	Tue Aug 12 16:36:05 2003
--- llvm/test/Regression/Transforms/Reassociate/2003-08-12-InfiniteLoop.ll	Tue Aug 12 16:35:55 2003
***************
*** 0 ****
--- 1,10 ----
+ ; RUN: as < %s | opt -reassociate -disable-output
+ 
+ implementation   ; Functions:
+ 
+ int %test(int %A.1, int %B.1, int %C.1, int %D.1) {
+ 	%tmp.16 = and int %A.1, %B.1		; <int> [#uses=1]
+ 	%tmp.18 = and int %tmp.16, %C.1		; <int> [#uses=1]
+ 	%tmp.20 = and int %tmp.18, %D.1		; <int> [#uses=1]
+ 	ret int %tmp.20
+ }




From lattner at cs.uiuc.edu  Tue Aug 12 16:46:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 16:46:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/Reassociate.cpp
Message-ID: <200308122145.QAA11105@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

Reassociate.cpp updated: 1.20 -> 1.21

---
Log message:

Fix bug: Reassociate/2003-08-12-InfiniteLoop.ll



---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/Reassociate.cpp
diff -u llvm/lib/Transforms/Scalar/Reassociate.cpp:1.20 llvm/lib/Transforms/Scalar/Reassociate.cpp:1.21
--- llvm/lib/Transforms/Scalar/Reassociate.cpp:1.20	Tue Aug 12 15:14:27 2003
+++ llvm/lib/Transforms/Scalar/Reassociate.cpp	Tue Aug 12 16:45:24 2003
@@ -126,12 +126,13 @@
     if (LHSI->getOpcode() == I->getOpcode() && LHSI->use_size() == 1) {
       // If the rank of our current RHS is less than the rank of the LHS's LHS,
       // then we reassociate the two instructions...
-      if (RHSRank < getRank(LHSI->getOperand(0))) {
-        unsigned TakeOp = 0;
-        if (BinaryOperator *IOp = dyn_cast<BinaryOperator>(LHSI->getOperand(0)))
-          if (IOp->getOpcode() == LHSI->getOpcode())
-            TakeOp = 1;   // Hoist out non-tree portion
 
+      unsigned TakeOp = 0;
+      if (BinaryOperator *IOp = dyn_cast<BinaryOperator>(LHSI->getOperand(0)))
+        if (IOp->getOpcode() == LHSI->getOpcode())
+          TakeOp = 1;   // Hoist out non-tree portion
+
+      if (RHSRank < getRank(LHSI->getOperand(TakeOp))) {
         // Convert ((a + 12) + 10) into (a + (12 + 10))
         I->setOperand(0, LHSI->getOperand(TakeOp));
         LHSI->setOperand(TakeOp, RHS);




From lattner at cs.uiuc.edu  Tue Aug 12 16:54:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 16:54:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200308122153.QAA16940@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.111 -> 1.112

---
Log message:

Allow pulling logical operations through shifts.
This implements InstCombine/shift.ll:test14*


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.111 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.112
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.111	Tue Aug 12 14:17:27 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Tue Aug 12 16:53:41 2003
@@ -15,8 +15,8 @@
 // This pass guarantees that the following cannonicalizations are performed on
 // the program:
 //    1. If a binary operator has a constant operand, it is moved to the RHS
-//    2. Logical operators with constant operands are always grouped so that
-//       'or's are performed first, then 'and's, then 'xor's.
+//    2. Bitwise operators with constant operands are always grouped so that
+//       shifts are performed first, then or's, then and's, then xor's.
 //    3. SetCC instructions are converted from <,>,<=,>= to ==,!= if possible
 //    4. All SetCC instructions on boolean values are replaced with logical ops
 //    N. This list is incomplete
@@ -879,6 +879,7 @@
 Instruction *InstCombiner::visitShiftInst(ShiftInst &I) {
   assert(I.getOperand(1)->getType() == Type::UByteTy);
   Value *Op0 = I.getOperand(0), *Op1 = I.getOperand(1);
+  bool isLeftShift = I.getOpcode() == Instruction::Shl;
 
   // shl X, 0 == X and shr X, 0 == X
   // shl 0, X == 0 and shr 0, X == 0
@@ -886,17 +887,68 @@
       Op0 == Constant::getNullValue(Op0->getType()))
     return ReplaceInstUsesWith(I, Op0);
 
+  // shr int -1, X = -1   (for any arithmetic shift rights of ~0)
+  if (!isLeftShift)
+    if (ConstantSInt *CSI = dyn_cast<ConstantSInt>(Op0))
+      if (CSI->isAllOnesValue())
+        return ReplaceInstUsesWith(I, CSI);
+
   if (ConstantUInt *CUI = dyn_cast<ConstantUInt>(Op1)) {
     // shl uint X, 32 = 0 and shr ubyte Y, 9 = 0, ... just don't eliminate shr
     // of a signed value.
     //
     unsigned TypeBits = Op0->getType()->getPrimitiveSize()*8;
     if (CUI->getValue() >= TypeBits &&
-        (!Op0->getType()->isSigned() || I.getOpcode() == Instruction::Shl))
+        (!Op0->getType()->isSigned() || isLeftShift))
       return ReplaceInstUsesWith(I, Constant::getNullValue(Op0->getType()));
 
+    // If the operand is an bitwise operator with a constant RHS, and the
+    // shift is the only use, we can pull it out of the shift.
+    if (Op0->use_size() == 1)
+      if (BinaryOperator *Op0BO = dyn_cast<BinaryOperator>(Op0))
+        if (ConstantInt *Op0C = dyn_cast<ConstantInt>(Op0BO->getOperand(1))) {
+          bool isValid = true;     // Valid only for And, Or, Xor
+          bool highBitSet = false; // Transform if high bit of constant set?
+
+          switch (Op0BO->getOpcode()) {
+          default: isValid = false; break;   // Do not perform transform!
+          case Instruction::Or:
+          case Instruction::Xor:
+            highBitSet = false;
+            break;
+          case Instruction::And:
+            highBitSet = true;
+            break;
+          }
+
+          // If this is a signed shift right, and the high bit is modified
+          // by the logical operation, do not perform the transformation.
+          // The highBitSet boolean indicates the value of the high bit of
+          // the constant which would cause it to be modified for this
+          // operation.
+          //
+          if (isValid && !isLeftShift && !I.getType()->isUnsigned()) {
+            uint64_t Val = Op0C->getRawValue();
+            isValid = ((Val & (1 << (TypeBits-1))) != 0) == highBitSet;
+          }
+
+          if (isValid) {
+            Constant *NewRHS =
+              ConstantFoldShiftInstruction(I.getOpcode(), Op0C, CUI);
+
+            Instruction *NewShift =
+              new ShiftInst(I.getOpcode(), Op0BO->getOperand(0), CUI,
+                            Op0BO->getName());
+            Op0BO->setName("");
+            InsertNewInstBefore(NewShift, I);
+
+            return BinaryOperator::create(Op0BO->getOpcode(), NewShift,
+                                          NewRHS);
+          }
+        }
+
     // If this is a shift of a shift, see if we can fold the two together...
-    if (ShiftInst *Op0SI = dyn_cast<ShiftInst>(Op0)) {
+    if (ShiftInst *Op0SI = dyn_cast<ShiftInst>(Op0))
       if (ConstantUInt *ShiftAmt1C =
                                  dyn_cast<ConstantUInt>(Op0SI->getOperand(1))) {
         unsigned ShiftAmt1 = ShiftAmt1C->getValue();
@@ -912,13 +964,13 @@
         // Check for (A << c1) >> c2 or visaversa.  If we are dealing with
         // signed types, we can only support the (A >> c1) << c2 configuration,
         // because it can not turn an arbitrary bit of A into a sign bit.
-        if (I.getType()->isUnsigned() || I.getOpcode() == Instruction::Shl) {
+        if (I.getType()->isUnsigned() || isLeftShift) {
           // Calculate bitmask for what gets shifted off the edge...
           Constant *C = ConstantIntegral::getAllOnesValue(I.getType());
-          if (I.getOpcode() == Instruction::Shr)
-            C = ConstantExpr::getShift(Instruction::Shr, C, ShiftAmt1C);
-          else
+          if (isLeftShift)
             C = ConstantExpr::getShift(Instruction::Shl, C, ShiftAmt1C);
+          else
+            C = ConstantExpr::getShift(Instruction::Shr, C, ShiftAmt1C);
           
           Instruction *Mask =
             BinaryOperator::create(Instruction::And, Op0SI->getOperand(0),
@@ -937,21 +989,14 @@
           }
         }
       }
-    }
 
     // Check to see if we are shifting left by 1.  If so, turn it into an add
     // instruction.
-    if (I.getOpcode() == Instruction::Shl && CUI->equalsInt(1))
+    if (isLeftShift && CUI->equalsInt(1))
       // Convert 'shl int %X, 1' to 'add int %X, %X'
       return BinaryOperator::create(Instruction::Add, Op0, Op0, I.getName());
   }
 
-  // shr int -1, X = -1   (for any arithmetic shift rights of ~0)
-  if (I.getOpcode() == Instruction::Shr)
-    if (ConstantSInt *CSI = dyn_cast<ConstantSInt>(Op0))
-      if (CSI->isAllOnesValue())
-        return ReplaceInstUsesWith(I, CSI);
-  
   return 0;
 }
 




From gaeke at cs.uiuc.edu  Tue Aug 12 17:01:10 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 17:01:10 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
Message-ID: <200308122200.RAA18630@trinity.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Instrumentation/ProfilePaths:

InstLoops.cpp updated: 1.4 -> 1.5

---
Log message:

Give std::map<BasicBlock *, BasicBlock *> the short name BBMap, because
 it's used 7 different times.
Rename `getBackEdges' to `findAndInstrumentBackEdges', for clarity.
Remove some excess whitespace and commented-out code.
Use shorter forms of CallInst ctors.
Do not make `reopt_threshold' visible to the LLVM program, and do not
 pass it to the call to `reoptimizerInitialize'.  Don't pass the
 GlobalVariable representing it to any of our helper methods.
 `reopt_threshold' is an internal parameter of the reoptimizer, which
 InstLoops does not need to know about.


---
Diffs of the changes:

Index: llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp
diff -u llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.4 llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.5
--- llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp:1.4	Thu Jul 10 16:55:57 2003
+++ llvm/lib/Transforms/Instrumentation/ProfilePaths/InstLoops.cpp	Tue Aug 12 17:00:24 2003
@@ -29,6 +29,7 @@
 };
 
 namespace{
+  typedef std::map<BasicBlock *, BasicBlock *> BBMap;
   struct InstLoops : public FunctionPass {
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.addRequired<DominatorSet>();
@@ -38,15 +39,14 @@
     void getBackEdgesVisit(BasicBlock *u,
 			   std::map<BasicBlock *, Color > &color,
 			   std::map<BasicBlock *, int > &d, 
-			   int &time, Value *threshold, 
-			   std::map<BasicBlock *, BasicBlock *> &be);
-    void removeRedundant(std::map<BasicBlock *, BasicBlock *> &be);
-    void getBackEdges(Function &F, Value *threshold);
+			   int &time, BBMap &be);
+    void removeRedundant(BBMap &be);
+    void findAndInstrumentBackEdges(Function &F);
   public:
     bool runOnFunction(Function &F);
   };
   
-    RegisterOpt<InstLoops> X("instloops", "Instrument backedges for profiling");
+  RegisterOpt<InstLoops> X("instloops", "Instrument backedges for profiling");
 }
 
 // createInstLoopsPass - Create a new pass to add path profiling
@@ -61,20 +61,17 @@
 void InstLoops::getBackEdgesVisit(BasicBlock *u,
                        std::map<BasicBlock *, Color > &color,
                        std::map<BasicBlock *, int > &d, 
-                       int &time, Value *threshold, 
-		       std::map<BasicBlock *, BasicBlock *> &be) {
-  
+                       int &time, BBMap &be) {
   color[u]=GREY;
   time++;
   d[u]=time;
 
   for(BasicBlock::succ_iterator vl = succ_begin(u), 
 	ve = succ_end(u); vl != ve; ++vl){
-    
     BasicBlock *BB = *vl;
 
     if(color[BB]!=GREY && color[BB]!=BLACK){
-      getBackEdgesVisit(BB, color, d, time, threshold, be);
+      getBackEdgesVisit(BB, color, d, time, be);
     }
     
     //now checking for d and f vals
@@ -91,26 +88,17 @@
 
 //look at all BEs, and remove all BEs that are dominated by other BE's in the
 //set
-void InstLoops::removeRedundant(std::map<BasicBlock *, BasicBlock *> &be){
+void InstLoops::removeRedundant(BBMap &be) {
   std::vector<BasicBlock *> toDelete;
   for(std::map<BasicBlock *, BasicBlock *>::iterator MI = be.begin(), 
-	ME = be.end(); MI != ME; ++MI){
-    //std::cerr<<MI->first->getName()<<"\t->\t"<<MI->second->getName()<<"\n";
-    //std::cerr<<MI->first;
-    //std::cerr<<MI->second;
-    for(std::map<BasicBlock *, BasicBlock *>::iterator MMI = be.begin(), 
-	  MME = be.end(); MMI != MME; ++MMI){
-      if(DS->properlyDominates(MI->first, MMI->first)){
+	ME = be.end(); MI != ME; ++MI)
+    for(BBMap::iterator MMI = be.begin(), MME = be.end(); MMI != MME; ++MMI)
+      if(DS->properlyDominates(MI->first, MMI->first))
 	toDelete.push_back(MMI->first);
-	//std::cerr<<MI->first->getName()<<"\t Dominates\t"<<MMI->first->getName();
-      }
-    }
-  }
-
+  // Remove all the back-edges we found from be.
   for(std::vector<BasicBlock *>::iterator VI = toDelete.begin(), 
-	VE = toDelete.end(); VI != VE; ++VI){
+	VE = toDelete.end(); VI != VE; ++VI)
     be.erase(*VI);
-  }
 }
 
 //getting the backedges in a graph
@@ -124,12 +112,12 @@
 //have been visited
 //So we have a back edge when we meet a successor of
 //a node with smaller time, and GREY color
-void InstLoops::getBackEdges(Function &F, Value *threshold){
+void InstLoops::findAndInstrumentBackEdges(Function &F){
   std::map<BasicBlock *, Color > color;
   std::map<BasicBlock *, int> d;
-  std::map<BasicBlock *, BasicBlock *> be;
+  BBMap be;
   int time=0;
-  getBackEdgesVisit(F.begin(), color, d, time, threshold, be);
+  getBackEdgesVisit(F.begin(), color, d, time, be);
 
   removeRedundant(be);
 
@@ -159,7 +147,7 @@
         
     assert(inCountMth && "Initial method could not be inserted!");
 
-    Instruction *call = new CallInst(inCountMth, "");
+    Instruction *call = new CallInst(inCountMth);
     lt.push_back(call);
     lt.push_back(new BranchInst(BB));
       
@@ -177,46 +165,22 @@
   }
 }
 
-//Per function pass for inserting counters and call function
+/// Entry point for FunctionPass that inserts calls to trigger function.
+///
 bool InstLoops::runOnFunction(Function &F){
-  
-  static GlobalVariable *threshold = NULL;
-  static bool insertedThreshold = false;
-
   DS  = &getAnalysis<DominatorSet>();
-
   if(F.isExternal()) {
     return false;
   }
-
-  if(!insertedThreshold){
-    threshold = new GlobalVariable(Type::IntTy, false,  
-				   GlobalValue::ExternalLinkage, 0,
-                                   "reopt_threshold");
-    
-    F.getParent()->getGlobalList().push_back(threshold);
-    insertedThreshold = true;
-  }
-
+  // Add a call to reoptimizerInitialize() to beginning of function named main.
   if(F.getName() == "main"){
-    //intialize threshold
-    std::vector<const Type*> initialize_args;
-    initialize_args.push_back(PointerType::get(Type::IntTy));
-    
-    const FunctionType *Fty = FunctionType::get(Type::VoidTy, initialize_args,
-                                                false);
-    Function *initialMeth = F.getParent()->getOrInsertFunction("reoptimizerInitialize", Fty);
+    std::vector<const Type*> argTypes;  // Empty formal parameter list.
+    const FunctionType *Fty = FunctionType::get(Type::VoidTy, argTypes, false);
+    Function *initialMeth =
+      F.getParent()->getOrInsertFunction("reoptimizerInitialize", Fty);
     assert(initialMeth && "Initialize method could not be inserted!");
-    
-    std::vector<Value *> trargs;
-    trargs.push_back(threshold);
-  
-    new CallInst(initialMeth, trargs, "", F.begin()->begin());
+    new CallInst(initialMeth, "", F.begin()->begin());  // Insert it.
   }
-
-  assert(threshold && "GlobalVariable threshold not defined!");
-  
-  getBackEdges(F, threshold);
-  
-  return true;
+  findAndInstrumentBackEdges(F);
+  return true;  // Function was modified.
 }




From vadve at cs.uiuc.edu  Tue Aug 12 17:21:01 2003
From: vadve at cs.uiuc.edu (Vikram Adve)
Date: Tue Aug 12 17:21:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/LiveVar/BBLiveVar.h FunctionLiveVarInfo.cpp
Message-ID: <200308122220.RAA03493@psmith.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/LiveVar:

BBLiveVar.h updated: 1.20 -> 1.21
FunctionLiveVarInfo.cpp updated: 1.44 -> 1.45

---
Log message:

For an instruction with delay slots, mark all live values before
the instruction as being live before/after the delay slot
instructions as well.


---
Diffs of the changes:

Index: llvm/lib/Analysis/LiveVar/BBLiveVar.h
diff -u llvm/lib/Analysis/LiveVar/BBLiveVar.h:1.20 llvm/lib/Analysis/LiveVar/BBLiveVar.h:1.21
--- llvm/lib/Analysis/LiveVar/BBLiveVar.h:1.20	Tue Jan 14 16:56:23 2003
+++ llvm/lib/Analysis/LiveVar/BBLiveVar.h	Tue Aug 12 17:19:59 2003
@@ -72,7 +72,10 @@
   bool applyFlowFunc();
 
   inline const ValueSet &getOutSet() const { return OutSet; }
+  inline       ValueSet &getOutSet()       { return OutSet; }
+
   inline const ValueSet  &getInSet() const { return InSet; }
+  inline       ValueSet  &getInSet()       { return InSet; }
 
   void printAllSets() const;      // for printing Def/In/Out sets
   void printInOutSets() const;    // for printing In/Out sets


Index: llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp
diff -u llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.44 llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.45
--- llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.44	Tue Jul 29 14:42:32 2003
+++ llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp	Tue Aug 12 17:19:59 2003
@@ -8,6 +8,8 @@
 #include "llvm/CodeGen/FunctionLiveVarInfo.h"
 #include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Support/CFG.h"
 #include "Support/PostOrderIterator.h"
 #include "Support/SetOperations.h"
@@ -40,11 +42,17 @@
 const ValueSet &FunctionLiveVarInfo::getOutSetOfBB(const BasicBlock *BB) const {
   return BBLiveVar::GetFromBB(*BB)->getOutSet();
 }
+      ValueSet &FunctionLiveVarInfo::getOutSetOfBB(const BasicBlock *BB)       {
+  return BBLiveVar::GetFromBB(*BB)->getOutSet();
+}
 
 // gets InSet of a BB
 const ValueSet &FunctionLiveVarInfo::getInSetOfBB(const BasicBlock *BB) const {
   return BBLiveVar::GetFromBB(*BB)->getInSet();
 }
+      ValueSet &FunctionLiveVarInfo::getInSetOfBB(const BasicBlock *BB)       {
+  return BBLiveVar::GetFromBB(*BB)->getInSet();
+}
 
 
 //-----------------------------------------------------------------------------
@@ -145,12 +153,13 @@
   M = 0;
 
   // Then delete all objects of type ValueSet created in calcLiveVarSetsForBB
-  // and entered into  MInst2LVSetBI and  MInst2LVSetAI (these are caches
-  // to return ValueSet's before/after a machine instruction quickly). It
-  // is sufficient to free up all ValueSet using only one cache since 
-  // both caches refer to the same sets
+  // and entered into MInst2LVSetBI and MInst2LVSetAI (these are caches
+  // to return ValueSet's before/after a machine instruction quickly).
+  // We do not need to free up ValueSets in MInst2LVSetAI because it holds
+  // pointers to the same sets as in MInst2LVSetBI (for all instructions
+  // except the last one in a BB) or in BBLiveVar (for the last instruction).
   //
-  for (std::map<const MachineInstr*, const ValueSet*>::iterator
+  for (hash_map<const MachineInstr*, ValueSet*>::iterator
          MI = MInst2LVSetBI.begin(),
          ME = MInst2LVSetBI.end(); MI != ME; ++MI)
     delete MI->second;           // delete all ValueSets in  MInst2LVSetBI
@@ -178,12 +187,12 @@
 //-----------------------------------------------------------------------------
 
 const ValueSet &
-FunctionLiveVarInfo::getLiveVarSetBeforeMInst(const MachineInstr *MInst,
+FunctionLiveVarInfo::getLiveVarSetBeforeMInst(const MachineInstr *MI,
                                               const BasicBlock *BB) {
-  const ValueSet *LVSet = MInst2LVSetBI[MInst];
+  ValueSet* &LVSet = MInst2LVSetBI[MI]; // ref. to map entry
   if (LVSet == NULL && BB != NULL) {    // if not found and BB provided
     calcLiveVarSetsForBB(BB);           // calc LVSet for all instrs in BB
-    LVSet = MInst2LVSetBI[MInst];
+    assert(LVSet != NULL);
   }
   return *LVSet;
 }
@@ -197,10 +206,10 @@
 FunctionLiveVarInfo::getLiveVarSetAfterMInst(const MachineInstr *MI,
                                              const BasicBlock *BB) {
 
-  const ValueSet *LVSet = MInst2LVSetAI[MI];
+  ValueSet* &LVSet = MInst2LVSetAI[MI]; // ref. to map entry
   if (LVSet == NULL && BB != NULL) {    // if not found and BB provided 
     calcLiveVarSetsForBB(BB);           // calc LVSet for all instrs in BB
-    return *MInst2LVSetAI[MI];
+    assert(LVSet != NULL);
   }
   return *LVSet;
 }
@@ -250,14 +259,15 @@
   BBLiveVar *BBLV = BBLiveVar::GetFromBB(*BB);
   assert(BBLV && "BBLiveVar annotation doesn't exist?");
   const MachineBasicBlock &MIVec = BBLV->getMachineBasicBlock();
+  const MachineFunction &MF = MachineFunction::get(M);
+  const TargetMachine &TM = MF.getTarget();
 
   if (DEBUG_LV >= LV_DEBUG_Instr)
     std::cerr << "\n======For BB " << BB->getName()
               << ": Live var sets for instructions======\n";
   
-  ValueSet CurSet;
-  const ValueSet *SetAI = &getOutSetOfBB(BB);  // init SetAI with OutSet
-  set_union(CurSet, *SetAI);                   // CurSet now contains OutSet
+  ValueSet *SetAI = &getOutSetOfBB(BB);         // init SetAI with OutSet
+  ValueSet CurSet(*SetAI);                      // CurSet now contains OutSet
 
   // iterate over all the machine instructions in BB
   for (MachineBasicBlock::const_reverse_iterator MII = MIVec.rbegin(),
@@ -268,10 +278,23 @@
     MInst2LVSetAI[MI] = SetAI;                 // record in After Inst map
 
     applyTranferFuncForMInst(CurSet, MI);      // apply the transfer Func
-    ValueSet *NewSet = new ValueSet();         // create a new set and
-    set_union(*NewSet, CurSet);                // copy the set after T/F to it
- 
+    ValueSet *NewSet = new ValueSet(CurSet);   // create a new set with a copy
+                                               // of the set after T/F
     MInst2LVSetBI[MI] = NewSet;                // record in Before Inst map
+
+    // If the current machine instruction has delay slots, mark values
+    // used by this instruction as live before and after each delay slot
+    // instruction (After(MI) is the same as Before(MI+1) except for last MI).
+    if (unsigned DS = TM.getInstrInfo().getNumDelaySlots(MI->getOpCode())) {
+      MachineBasicBlock::const_iterator fwdMII = MII.base(); // ptr to *next* MI
+      for (unsigned i = 0; i < DS; ++i, ++fwdMII) {
+        assert(fwdMII != MIVec.end() && "Missing instruction in delay slot?");
+        MachineInstr* DelaySlotMI = *fwdMII;
+        set_union(*MInst2LVSetBI[DelaySlotMI], *NewSet);
+        if (i+1 == DS)
+          set_union(*MInst2LVSetAI[DelaySlotMI], *NewSet);
+      }
+    }
 
     if (DEBUG_LV >= LV_DEBUG_Instr) {
       std::cerr << "\nLive var sets before/after instruction " << *MI;




From vadve at cs.uiuc.edu  Tue Aug 12 17:23:02 2003
From: vadve at cs.uiuc.edu (Vikram Adve)
Date: Tue Aug 12 17:23:02 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
Message-ID: <200308122222.RAA03509@psmith.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/RegAlloc:

PhyRegAlloc.cpp updated: 1.103 -> 1.104

---
Log message:

For instructions in a delay slot of another instruction,
we no longer need to find the live-before set of the delayed
branch since that set is now included the live-before/after
set of the instructions in each delay slot.  Just assert that instead.


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.103 llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.104
--- llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.103	Tue Aug  5 17:11:13 2003
+++ llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp	Tue Aug 12 17:22:24 2003
@@ -24,6 +24,7 @@
 #include "llvm/Type.h"
 #include "llvm/iOther.h"
 #include "Support/STLExtras.h"
+#include "Support/SetOperations.h"
 #include "Support/CommandLine.h"
 #include <math.h>
 using std::cerr;
@@ -747,18 +748,21 @@
   RegClass *RC = LR->getRegClass();
 
   // Get the live-variable set to find registers free before this instr.
-  // If this instr. is in the delay slot of a branch or return, use the live
-  // var set before that branch or return -- we don't want to trample those!
+  const ValueSet &LVSetBef = LVI->getLiveVarSetBeforeMInst(MInst, BB);
+
+#ifndef NDEBUG
+  // If this instr. is in the delay slot of a branch or return, we need to
+  // include all live variables before that branch or return -- we don't want to
+  // trample those!  Verify that the set is included in the LV set before MInst.
   // 
-  MachineInstr *LiveBeforeThisMI = MInst;
   if (MII != MBB.begin()) {
     MachineInstr *PredMI = *(MII-1);
-    if (unsigned DS = TM.getInstrInfo().getNumDelaySlots(PredMI->getOpCode())) {
-      assert(DS == 1 && "Only checking immediate pred. for delay slots!");
-      LiveBeforeThisMI = PredMI;
-    }
+    if (unsigned DS = TM.getInstrInfo().getNumDelaySlots(PredMI->getOpCode()))
+      assert(set_difference(LVI->getLiveVarSetBeforeMInst(PredMI), LVSetBef)
+             .empty() && "Live-var set before branch should be included in "
+             "live-var set of each delay slot instruction!");
   }
-  const ValueSet &LVSetBef = LVI->getLiveVarSetBeforeMInst(LiveBeforeThisMI,BB);
+#endif
 
   MF.getInfo()->pushTempValue(MRI.getSpilledRegSize(RegType) );
   
@@ -1204,13 +1208,13 @@
 void PhyRegAlloc::move2DelayedInstr(const MachineInstr *OrigMI,
                                     const MachineInstr *DelayedMI)
 {
-  if (DEBUG_RA) {
+  // "added after" instructions of the original instr
+  std::vector<MachineInstr *> &OrigAft = AddedInstrMap[OrigMI].InstrnsAfter;
+
+  if (DEBUG_RA && OrigAft.size() > 0) {
     cerr << "\nRegAlloc: Moved InstrnsAfter for: " << *OrigMI;
     cerr << "         to last delay slot instrn: " << *DelayedMI;
   }
-
-  // "added after" instructions of the original instr
-  std::vector<MachineInstr *> &OrigAft = AddedInstrMap[OrigMI].InstrnsAfter;
 
   // "added after" instructions of the delayed instr
   std::vector<MachineInstr *> &DelayedAft=AddedInstrMap[DelayedMI].InstrnsAfter;




From vadve at cs.uiuc.edu  Tue Aug 12 18:40:01 2003
From: vadve at cs.uiuc.edu (Vikram Adve)
Date: Tue Aug 12 18:40:01 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/FunctionLiveVarInfo.h
Message-ID: <200308122339.SAA06284@psmith.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

FunctionLiveVarInfo.h updated: 1.27 -> 1.28

---
Log message:

Make MInst2LVSetBI and MInst2LVSetAI be hash_maps instead of maps.
Add some comments and non-const methods to fix constness problems.


---
Diffs of the changes:

Index: llvm/include/llvm/CodeGen/FunctionLiveVarInfo.h
diff -u llvm/include/llvm/CodeGen/FunctionLiveVarInfo.h:1.27 llvm/include/llvm/CodeGen/FunctionLiveVarInfo.h:1.28
--- llvm/include/llvm/CodeGen/FunctionLiveVarInfo.h:1.27	Tue Jul 29 14:32:04 2003
+++ llvm/include/llvm/CodeGen/FunctionLiveVarInfo.h	Tue Aug 12 18:39:08 2003
@@ -61,6 +61,7 @@
 #ifndef FUNCTION_LIVE_VAR_INFO_H
 #define FUNCTION_LIVE_VAR_INFO_H
 
+#include "Support/hash_map"
 #include "llvm/Pass.h"
 #include "llvm/CodeGen/ValueSet.h"
 
@@ -69,10 +70,12 @@
 
 class FunctionLiveVarInfo : public FunctionPass {
   // Machine Instr to LiveVarSet Map for providing LVset BEFORE each inst
-  std::map<const MachineInstr *, const ValueSet *> MInst2LVSetBI; 
+  // These sets are owned by this map and will be freed in releaseMemory().
+  hash_map<const MachineInstr *, ValueSet *> MInst2LVSetBI; 
 
-  // Machine Instr to LiveVarSet Map for providing LVset AFTER each inst
-  std::map<const MachineInstr *, const ValueSet *> MInst2LVSetAI; 
+  // Machine Instr to LiveVarSet Map for providing LVset AFTER each inst.
+  // These sets are just pointers to sets in MInst2LVSetBI or BBLiveVar.
+  hash_map<const MachineInstr *, ValueSet *> MInst2LVSetAI; 
 
   // Stored Function that the data is computed with respect to
   const Function *M;
@@ -104,11 +107,13 @@
 
   // --------- Functions to access analysis results -------------------
 
-  // gets OutSet of a BB
+  // get OutSet of a BB
   const ValueSet &getOutSetOfBB(const BasicBlock *BB) const;
+        ValueSet &getOutSetOfBB(const BasicBlock *BB)      ;
 
-  // gets InSet of a BB
+  // get InSet of a BB
   const ValueSet &getInSetOfBB(const BasicBlock *BB) const;
+        ValueSet &getInSetOfBB(const BasicBlock *BB)      ;
 
   // gets the Live var set BEFORE an instruction.
   // if BB is specified and the live var set has not yet been computed,




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 19:31:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 19:31:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/README.txt
Message-ID: <200308130030.h7D0UwS06824@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

README.txt updated: 1.8 -> 1.9

---
Log message:

Just incorporating some notes I wrote for myself into a place where they won't
get lost...


---
Diffs of the changes:

Index: llvm/lib/Target/X86/README.txt
diff -u llvm/lib/Target/X86/README.txt:1.8 llvm/lib/Target/X86/README.txt:1.9
--- llvm/lib/Target/X86/README.txt:1.8	Thu Jul 31 12:56:05 2003
+++ llvm/lib/Target/X86/README.txt	Tue Aug 12 19:30:48 2003
@@ -176,3 +176,17 @@
 
 2. PassManager needs to be able to run just a single function through a pipeline
    of FunctionPass's.
+
+3. X86/Printer.cpp and Sparc/EmitAssembly.cpp both have copies of what is
+   roughly the same code, used to output constants in a form the assembler
+   can understand. These functions should be shared at some point. They
+   should be rewritten to pass around iostreams instead of strings. The
+   list of functions is as follows:
+
+   isStringCompatible
+   toOctal
+   ConstantExprToString
+   valToExprString
+   getAsCString
+   printSingleConstantValue (with TypeToDataDirective inlined)
+   printConstantValueOnly




From lattner at cs.uiuc.edu  Tue Aug 12 21:28:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 21:28:00 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Mapping/Makefile
Message-ID: <200308130227.VAA23274@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/Mapping:

Makefile (r1.1) removed

---
Log message:

Obsolete file


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Tue Aug 12 21:29:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 21:29:00 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Makefile
Message-ID: <200308130228.VAA23293@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

Makefile updated: 1.35 -> 1.36

---
Log message:

Incorporate mapping library into the sparc library


---
Diffs of the changes:

Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.35 llvm/tools/lli/Makefile:1.36
--- llvm/tools/lli/Makefile:1.35	Mon Aug 11 09:59:53 2003
+++ llvm/tools/lli/Makefile	Tue Aug 12 21:28:16 2003
@@ -36,7 +36,7 @@
   JITLIBS  += sparc 
   ARCHLIBS += sched livevar instrument.a profpaths \
               bcwriter transforms.a ipo.a ipa.a datastructure.a regalloc \
-              mapping select postopts.a preopts
+              select postopts.a preopts
 endif
 
 USEDLIBS = lli-interpreter $(JITLIBS) $(ARCHLIBS) scalaropts analysis.a \




From lattner at cs.uiuc.edu  Tue Aug 12 21:29:04 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 21:29:04 2003
Subject: [llvm-commits] CVS: llvm/tools/llc/Makefile
Message-ID: <200308130228.VAA23300@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/llc:

Makefile updated: 1.38 -> 1.39

---
Log message:

Incorporate mapping library into the sparc library



---
Diffs of the changes:

Index: llvm/tools/llc/Makefile
diff -u llvm/tools/llc/Makefile:1.38 llvm/tools/llc/Makefile:1.39
--- llvm/tools/llc/Makefile:1.38	Mon Aug 11 09:59:51 2003
+++ llvm/tools/llc/Makefile	Tue Aug 12 21:28:20 2003
@@ -1,7 +1,6 @@
 LEVEL = ../..
 TOOLNAME = llc
-USEDLIBS = mapping \
-           sparc \
+USEDLIBS = sparc \
            x86 \
 	   selection \
            regalloc \




From lattner at cs.uiuc.edu  Tue Aug 12 21:38:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 21:38:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Makefile
Message-ID: <200308130237.VAA11054@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

Makefile updated: 1.11 -> 1.12

---
Log message:

Mapping directory no longer exists


---
Diffs of the changes:

Index: llvm/lib/CodeGen/Makefile
diff -u llvm/lib/CodeGen/Makefile:1.11 llvm/lib/CodeGen/Makefile:1.12
--- llvm/lib/CodeGen/Makefile:1.11	Mon Aug 11 09:57:48 2003
+++ llvm/lib/CodeGen/Makefile	Tue Aug 12 21:37:24 2003
@@ -1,5 +1,5 @@
 LEVEL = ../..
-PARALLEL_DIRS = PreOpts InstrSelection InstrSched RegAlloc PostOpts Mapping Selection
+PARALLEL_DIRS = PreOpts InstrSelection InstrSched RegAlloc PostOpts Selection
 LIBRARYNAME = codegen
 
 include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Tue Aug 12 21:39:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 21:39:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/MappingInfo.cpp MappingInfo.h Sparc.cpp SparcInternals.h StackSlots.cpp
Message-ID: <200308130238.VAA11822@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

MappingInfo.cpp updated: 1.10 -> 1.11
MappingInfo.h updated: 1.2 -> 1.3
Sparc.cpp updated: 1.74 -> 1.75
SparcInternals.h updated: 1.96 -> 1.97
StackSlots.cpp updated: 1.5 -> 1.6

---
Log message:

Adjust files for move of mapping info stuff into the Sparc directory


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/MappingInfo.cpp
diff -u llvm/lib/Target/Sparc/MappingInfo.cpp:1.10 llvm/lib/Target/Sparc/MappingInfo.cpp:1.11
--- llvm/lib/Target/Sparc/MappingInfo.cpp:1.10	Wed Jun  4 17:07:10 2003
+++ llvm/lib/Target/Sparc/MappingInfo.cpp	Tue Aug 12 21:38:16 2003
@@ -35,10 +35,9 @@
 //
 //===--------------------------------------------------------------------===//
 
-#include "llvm/Reoptimizer/Mapping/MappingInfo.h"
+#include "MappingInfo.h"
 #include "llvm/Pass.h"
 #include "llvm/Module.h"
-#include "llvm/CodeGen/MachineInstr.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
 


Index: llvm/lib/Target/Sparc/MappingInfo.h
diff -u llvm/lib/Target/Sparc/MappingInfo.h:1.2 llvm/lib/Target/Sparc/MappingInfo.h:1.3
--- llvm/lib/Target/Sparc/MappingInfo.h:1.2	Wed Jun  4 17:02:47 2003
+++ llvm/lib/Target/Sparc/MappingInfo.h	Tue Aug 12 21:38:16 2003
@@ -1,12 +1,12 @@
-//===- llvm/Reoptimizer/Mapping/MappingInfo.h ------------------*- C++ -*--=////
+//===- lib/Target/Sparc/MappingInfo.h ---------------------------*- C++ -*-===//
 //
 // Data structures to support the Reoptimizer's Instruction-to-MachineInstr
 // mapping information gatherer.
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_REOPTIMIZER_MAPPING_MAPPINGINFO_H
-#define LLVM_REOPTIMIZER_MAPPING_MAPPINGINFO_H
+#ifndef MAPPINGINFO_H
+#define MAPPINGINFO_H
 
 #include <iosfwd>
 #include <vector>
@@ -16,9 +16,8 @@
 Pass *getMappingInfoCollector(std::ostream &out);
 
 class MappingInfo {
-  class byteVector : public std::vector <unsigned char> {
-  public:
-	void dumpAssembly (std::ostream &Out);
+  struct byteVector : public std::vector <unsigned char> {
+    void dumpAssembly (std::ostream &Out);
   };
   std::string comment;
   std::string symbolPrefix;
@@ -26,11 +25,11 @@
   byteVector bytes;
 public:
   void outByte (unsigned char b) { bytes.push_back (b); }
-  MappingInfo (std::string _comment, std::string _symbolPrefix,
-	           unsigned _functionNumber) : comment(_comment),
-        	   symbolPrefix(_symbolPrefix), functionNumber(_functionNumber) { }
+  MappingInfo (std::string Comment, std::string SymbolPrefix,
+	           unsigned FunctionNumber) : comment(Comment),
+        	   symbolPrefix(SymbolPrefix), functionNumber(FunctionNumber) {}
   void dumpAssembly (std::ostream &Out);
-  unsigned char *getBytes (unsigned int &length) {
+  unsigned char *getBytes (unsigned &length) {
 	length = bytes.size(); return &bytes[0];
   }
 };


Index: llvm/lib/Target/Sparc/Sparc.cpp
diff -u llvm/lib/Target/Sparc/Sparc.cpp:1.74 llvm/lib/Target/Sparc/Sparc.cpp:1.75
--- llvm/lib/Target/Sparc/Sparc.cpp:1.74	Tue Aug 12 10:51:02 2003
+++ llvm/lib/Target/Sparc/Sparc.cpp	Tue Aug 12 21:38:16 2003
@@ -6,22 +6,21 @@
 //===----------------------------------------------------------------------===//
 
 #include "SparcInternals.h"
-#include "llvm/Target/TargetMachineImpls.h"
+#include "MappingInfo.h" 
 #include "llvm/Function.h"
 #include "llvm/PassManager.h"
+#include "llvm/Assembly/PrintModulePass.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/CodeGen/MachineFunctionInfo.h"
 #include "llvm/CodeGen/PreSelection.h"
-#include "llvm/CodeGen/StackSlots.h"
 #include "llvm/CodeGen/PeepholeOpts.h"
 #include "llvm/CodeGen/InstrSelection.h"
 #include "llvm/CodeGen/InstrScheduling.h"
 #include "llvm/CodeGen/RegisterAllocation.h"
 #include "llvm/CodeGen/MachineCodeForInstruction.h"
-#include "llvm/Reoptimizer/Mapping/MappingInfo.h" 
+#include "llvm/Target/TargetMachineImpls.h"
 #include "Support/CommandLine.h"
-#include "llvm/Assembly/PrintModulePass.h"
 
 static const unsigned ImplicitRegUseList[] = { 0 }; /* not used yet */
 // Build the MachineInstruction Description Array...


Index: llvm/lib/Target/Sparc/SparcInternals.h
diff -u llvm/lib/Target/Sparc/SparcInternals.h:1.96 llvm/lib/Target/Sparc/SparcInternals.h:1.97
--- llvm/lib/Target/Sparc/SparcInternals.h:1.96	Tue Jul 29 14:54:41 2003
+++ llvm/lib/Target/Sparc/SparcInternals.h	Tue Aug 12 21:38:16 2003
@@ -650,8 +650,13 @@
 /// instructions. This pass enables the usage of the JIT register allocator(s).
 Pass *createAddRegNumToValuesPass();
 
+/// createStackSlotsPass - External interface to stack-slots pass that enters 2
+/// empty slots at the top of each function stack
+Pass *createStackSlotsPass(const TargetMachine &TM);
+
+
 //---------------------------------------------------------------------------
-// class UltraSparcMachine 
+// class UltraSparc 
 // 
 // Purpose:
 //   Primary interface to machine description for the UltraSPARC.


Index: llvm/lib/Target/Sparc/StackSlots.cpp
diff -u llvm/lib/Target/Sparc/StackSlots.cpp:1.5 llvm/lib/Target/Sparc/StackSlots.cpp:1.6
--- llvm/lib/Target/Sparc/StackSlots.cpp:1.5	Tue Jan 14 15:58:45 2003
+++ llvm/lib/Target/Sparc/StackSlots.cpp	Tue Aug 12 21:38:16 2003
@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/CodeGen/StackSlots.h"
-#include "llvm/Target/TargetMachine.h"
+#include "SparcInternals.h"
 #include "llvm/Constant.h"
 #include "llvm/Function.h"
 #include "llvm/DerivedTypes.h"




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:08:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:08:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SLI.cpp
Message-ID: <200308130307.h7D378t16271@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

SLI.cpp updated: 1.2 -> 1.3

---
Log message:

Don't include llvm/Bytecode/Reader.h.
Include Globals.h to get (most of) the extern decls we use.
Move initModules to Initialization.cpp; simplify its callers a bit.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SLI.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SLI.cpp:1.2 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SLI.cpp:1.3
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SLI.cpp:1.2	Tue Aug  5 13:21:27 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SLI.cpp	Tue Aug 12 22:05:58 2003
@@ -2,25 +2,20 @@
 #include "llvm/Reoptimizer/InstrUtils.h"
 #include "llvm/Reoptimizer/TraceCache.h"
 #include "llvm/Reoptimizer/VirtualMem.h"
-#include "llvm/Bytecode/Reader.h"
 #include "llvm/iTerminators.h"
 #include "Support/DataTypes.h"
 #include "llvm/Support/CFG.h"
 #include "llvm/Module.h"
 #include "GetTimer.h"
+#include "Globals.h"
 #include <algorithm>
 
 using namespace std;
 
-extern TraceCache *tr;
-extern TraceCache *tr2;
-extern int llvm_length;
-extern const unsigned char LLVMBytecode[];
 extern "C" void llvm_time_end();
-extern void countPath();//unsigned int path);
+extern void countPath();
 extern "C" void llvm_first_trigger();
-Module *M;
-static bool initialized = false;
+extern void initModules ();
 
 enum Color{
   WHITE,
@@ -33,17 +28,6 @@
 
 void doInlining(uint64_t addr1, vector<Function *> &stack, VirtualMem *vm);
 
-Module *initModules(){
-  Module *M;
-  
-  //BytecodeParser Parser;
-  std::string err;
-  M = ParseBytecodeBuffer(LLVMBytecode, llvm_length, "NOFILENAME", &err);
-  assert(M && "Module parsing failed!");
-
-  return M;
-}
-
 void doBackEdgeDFS(BasicBlock *node, map<BasicBlock*, BasicBlock *> &backedges,
 		   map<BasicBlock *, Color> &color){
   color[node] = GREY;
@@ -232,19 +216,12 @@
 //     }
 
 void doInstrumentation(uint64_t addr1, uint64_t addr2, VirtualMem *vm){
- 
-  //static Module *M;
-  
   uint64_t endAddr = addr2;
 
-  //get LLVM module
-  if(!initialized){
-    M = initModules();
-    //std::cerr<<M;
-    initialized = true;
-  }
-  
-  assert(M && "Module unparsed!");
+  // Make sure we have already parsed the LLVM bytecode and have the
+  // resulting LLVM Module handy.
+  if (!M)
+    initModules();
   
   //get BB address
   BasicBlock *root=NULL, *end=NULL;
@@ -525,20 +502,14 @@
 }
 
 void doInlining(uint64_t addr1, vector<Function *> &stack, VirtualMem *vm){
-  static bool initialized = false;
+  // Make sure we have already parsed the LLVM bytecode and have the
+  // resulting LLVM Module handy.
+  if (!M)
+    initModules();
 
-  assert(M && "No module!");
   Function *F = getRevFunction(M, addr1); 
 
   stack.push_back(F); //the functions inlined so far are in stack
-
-  //get LLVM module
-  if(!initialized){
-    M = initModules();
-    initialized = true;
-  }
-  
-  assert(M && "Module unparsed!");
   
   //get BB address
   BasicBlock *root = &F->front();




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:08:06 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:08:06 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.h
Message-ID: <200308130307.h7D37di16300@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

SecondTrigger.h added (r1.1)

---
Log message:

New file containing declarations of exported methods from SecondTrigger.cpp.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.h
diff -c /dev/null llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.h:1.1
*** /dev/null	Tue Aug 12 22:07:39 2003
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.h	Tue Aug 12 22:07:29 2003
***************
*** 0 ****
--- 1,26 ----
+ #ifndef SECONDTRIGGER_H
+ #define SECONDTRIGGER_H
+ 
+ #include <map>
+ #include <vector>
+ #include "Support/DataTypes.h"
+ 
+ extern std::map<uint64_t, uint64_t> firstTriggerAddr;
+ 
+ // Declarations of methods provided by SecondTrigger.cpp
+ void generateTraces(uint64_t start, uint64_t end, 
+ 		    std::vector<uint64_t> &paths, 
+ 		    uint64_t firstLevelTraceStartAddr);
+ void getReturnCode(std::vector<unsigned int> &traces, int &index, 
+ 		   uint64_t ret);
+ void getBranchExitCode(std::vector<unsigned int> &instVec, 
+ 		       std::map<int, uint64_t> &branchMap, 
+ 		       std::map<int, uint64_t> &targetMap, 
+ 		       std::map<int, uint64_t> &callMap);
+ /// Scan forward through memory starting from startAddr looking for a
+ /// branch instruction. When one is found, foundAddr is set to its
+ /// address, and the instruction word itself is returned.
+ ///
+ uint32_t scanForBranch (const uint64_t startAddr, uint64_t &foundAddr);
+ 
+ #endif // SECONDTRIGGER_H




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:08:10 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:08:10 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/RuntimeOptimizations.cpp
Message-ID: <200308130307.h7D37g816306@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

RuntimeOptimizations.cpp added (r1.1)

---
Log message:

New file containing driver for optimization passes.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/RuntimeOptimizations.cpp
diff -c /dev/null llvm/lib/Reoptimizer/LightWtProfiling/Trigger/RuntimeOptimizations.cpp:1.1
*** /dev/null	Tue Aug 12 22:07:42 2003
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/RuntimeOptimizations.cpp	Tue Aug 12 22:07:02 2003
***************
*** 0 ****
--- 1,39 ----
+ //===-- LightWtProfiling/Trigger/RuntimeOptimizations.cpp --------*- C++ -*--=//
+ //
+ // This file contains a method called upon the construction of a new trace of
+ // LLVM BasicBlocks that can be reoptimized. It sets up a PassManager and runs
+ // some predefined set of Passes over the module containing the trace.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "llvm/PassManager.h"
+ #include "llvm/BasicBlock.h"
+ #include "GetTimer.h"
+ #include "Globals.h"
+ 
+ // From Initialization.cpp
+ extern void initModules ();
+ 
+ /// This method is called when we have finally constructed a
+ /// trace. The first parameter is the vector of basic blocks that form
+ /// the trace; the second parameter is presumably one of the starting
+ /// addresses for the trace.
+ ///
+ void optimizeTrace (std::vector<BasicBlock *> &vBB, uint64_t a) {
+ #ifdef GET_ALL_INFO
+   // Dump the trace to the standard error stream. 
+   std::cerr << "=== In optimizeTrace; a = " << a << "================\n";
+   std::cerr << "--- Function where the trace starts -----------------\n";
+   std::cerr << vBB[0]->getParent ();
+   std::cerr << "--- BasicBlocks in the trace ------------------------\n";
+   for (unsigned i = 0; i < vBB.size (); ++i)
+     std::cerr << *vBB[i];
+   std::cerr << "=====================================================\n";
+ #endif // GET_ALL_INFO
+   if (!M)
+     initModules ();
+ 
+   PassManager PM;
+   // Add your favorite runtime optimization passes here.
+   PM.run (*M);
+ }




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:08:13 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:08:13 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp
Message-ID: <200308130307.h7D37tE16321@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

Initialization.cpp added (r1.1)

---
Log message:

New file intended to contain all the Reoptimizer's initialization code.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp
diff -c /dev/null llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp:1.1
*** /dev/null	Tue Aug 12 22:07:55 2003
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Initialization.cpp	Tue Aug 12 22:06:45 2003
***************
*** 0 ****
--- 1,59 ----
+ //===-- LightWtProfiling/Trigger/Initialization.cpp --------------*- C++ -*--=//
+ //
+ // Initialization functions called either from the main() of an
+ // instrumented program, or later when we determine that further
+ // instrumentation will be necessary. 
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "GetTimer.h"
+ #include "Globals.h"
+ #include "llvm/Bytecode/Reader.h"
+ 
+ // Function used as space for the second-level instrumentation trace cache.
+ extern "C" void dummyFunction2 ();
+ 
+ // Definitions of globals declared extern in Globals.h
+ int reopt_threshold;
+ long THRESHOLD_LEVEL_2;
+ long LEVEL_TWO_EXITS; 
+ TraceCache *tr;
+ TraceCache *tr2;
+ VirtualMem *vm;
+ Module *M;
+ 
+ /// Initialization method for the reoptimizer. A call to this function
+ /// from main() is inserted by the opt -instloops pass
+ /// (Transforms/Instrumentation/ProfilePaths/InstLoops.cpp).
+ ///
+ extern "C" void reoptimizerInitialize(){
+   vm = new VirtualMem();
+   tr = new TraceCache(30000, vm);
+   tr2 = new TraceCache(dummyFunction2, 30000, vm);
+  
+   if(getenv("THRESHOLD_LEVEL_2")!=NULL)
+     THRESHOLD_LEVEL_2 = atoi(getenv("THRESHOLD_LEVEL_2"));
+   else
+     THRESHOLD_LEVEL_2= DEFAULT_THRESHOLD_LEVEL_2;
+ 
+   LEVEL_TWO_EXITS = THRESHOLD_LEVEL_2/3;
+ 
+   if(getenv("THRESHOLD_LEVEL_1")!=NULL)
+     reopt_threshold = atoi(getenv("THRESHOLD_LEVEL_1"));
+   else
+     reopt_threshold = DEFAULT_THRESHOLD_LEVEL_1;
+ 
+   // FIXME: When do we need to call this?
+   //initialize_timer();
+ }
+ 
+ /// Initialization method for the reoptimizer that parses the bytecode
+ /// which was stored in the executable image. This is not supposed to
+ /// be called until 2nd-level instrumentation, probably because parsing
+ /// bytecode incurs some overhead.
+ ///
+ void initModules () {
+   std::string err;
+   M = ParseBytecodeBuffer(LLVMBytecode, llvm_length, "NOFILENAME", &err);
+   assert(M && "Module parsing failed!");
+ }




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:08:17 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:08:17 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp
Message-ID: <200308130307.h7D37tp16315@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

FirstTrigger.cpp updated: 1.10 -> 1.11

---
Log message:

Include Globals.h and SecondTrigger.h to pull in extern decls instead
 of declaring them here.
Don't need to use namespace std.
Move initialization code for reoptimizer to Initialization.cpp.
Give llvm_first_trigger a comment.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp:1.10 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp:1.11
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp:1.10	Thu Aug  7 22:56:07 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp	Tue Aug 12 22:05:45 2003
@@ -9,6 +9,8 @@
 //===----------------------------------------------------------------------===//
 
 #include "GetTimer.h"
+#include "Globals.h"
+#include "SecondTrigger.h"
 #include "RegSaveRestore.h"
 #include "scheduler.h"
 #include "SLI.h"
@@ -25,60 +27,10 @@
 #include <libcpc.h>
 #endif
 
-using namespace std;
-
-extern long THRESHOLD_LEVEL_2;
-extern long LEVEL_TWO_EXITS; 
-
-// Function used as space for the second-level instrumentation trace cache.
-extern "C" void dummyFunction2 ();
-
-// From SecondTrigger.cpp:
-extern uint32_t scanForBranch (const uint64_t startAddr, uint64_t &foundAddr);
-
-// Global counters for diagnostics:
-extern std::map<uint64_t, int> exitCounter;
-extern std::map<uint64_t, uint64_t> firstTriggerAddr; //tracestart addr
-extern std::map<uint64_t, std::pair<long, long> > backOffCounters; 
-
-int reopt_threshold = DEFAULT_THRESHOLD_LEVEL_1;
-int exit_count=0;
-
-TraceCache *tr;
-TraceCache *tr2;
-VirtualMem *vm;
-
-// Initialization method for the reoptimizer. A call to this function
-// from main() is inserted by the opt -instloops pass
-// (Transforms/Instrumentation/ProfilePaths/InstLoops.cpp).
-// reoptimizerInitialize is passed a pointer to reopt_threshold in t
-// (why?)
-extern "C" void reoptimizerInitialize(int *t){
-  vm = new VirtualMem();
-  tr = new TraceCache(30000, vm);
-  tr2 = new TraceCache(dummyFunction2, 30000, vm);
- 
-  if(getenv("THRESHOLD_LEVEL_2")!=NULL)
-    THRESHOLD_LEVEL_2 = atoi(getenv("THRESHOLD_LEVEL_2"));
-  else
-    THRESHOLD_LEVEL_2= DEFAULT_THRESHOLD_LEVEL_2;
-
-  LEVEL_TWO_EXITS = THRESHOLD_LEVEL_2/3;
-
-  if(getenv("THRESHOLD_LEVEL_1")!=NULL)
-    reopt_threshold = atoi(getenv("THRESHOLD_LEVEL_1"));
-  else
-    reopt_threshold = DEFAULT_THRESHOLD_LEVEL_1;
-
-  // FIXME: This should not be necessary if we are already setting
-  // reopt_threshold above. Remove the junk from InstLoops.cpp that
-  // makes reopt_threshold visible to the called program, and remove
-  // this, later.
-  *t=30;
-
-  //initialize_timer();
-}
-
+/// This is the function that performs first-level profiling. A call
+/// to this function from most back-edges is inserted by the InstLoops
+/// pass. It must be careful to save all the registers it may use.
+///
 extern "C" void llvm_first_trigger(){
   uint64_t i_reg_save[6];
   uint32_t f_reg_save[32];
@@ -103,7 +55,7 @@
 
   // This is where we keep the counter for each first-level
   // instrumented branch.
-  static map<uint64_t, int> counterMap;
+  static std::map<uint64_t, int> counterMap;
 
   // Get return address of this invocation (on SPARC, this is in %i7).
   uint64_t pcAddr = (uint64_t) __builtin_return_address(0);




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:08:21 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:08:21 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp
Message-ID: <200308130307.h7D37uq16327@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

SecondTrigger.cpp updated: 1.12 -> 1.13

---
Log message:

Move forward decls to SecondTrigger.h.
Include Globals.h and SecondTrigger.h to pull in extern & forward decls instead
 of declaring them here.
Move optimizeTrace to RuntimeOptimizations.cpp.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.12 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.13
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.12	Mon Aug 11 14:08:46 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp	Tue Aug 12 22:07:16 2003
@@ -9,7 +9,9 @@
 //===----------------------------------------------------------------------===//
 
 #include "GetTimer.h"
+#include "SecondTrigger.h"
 #include "RegSaveRestore.h"
+#include "Globals.h"
 #include "scheduler.h"
 #include "Timer.h"
 #include "llvm/Reoptimizer/Mapping/LLVMinfo.h"
@@ -33,56 +35,16 @@
 
 #define CALL 0x40000000
 
-long THRESHOLD_LEVEL_2;
-
-// If a trace selected as "hot" is exited more than a certain number
-// of times, then it will be rejected; this certain number is set to
-// 1/3 of the THRESHOLD_LEVEL_2 value.
-long LEVEL_TWO_EXITS; 
-
-extern TraceCache *tr;
-extern TraceCache *tr2;
-extern VirtualMem *vm;
-extern Module *M;
-
 static std::map<uint64_t, std::map<uint64_t, int> *> pathCounter;
 static std::map<uint64_t, int> totalCount;
+static std::map<uint64_t, int> exitCounter;
+static std::map<uint64_t, pair<long, long> > backOffCounters;
 
 extern "C" void llvm_first_trigger(int *cnt);
+extern void optimizeTrace (vector<BasicBlock *> &vBB, uint64_t a);
 
-// Forward declarations
-void generateTraces(uint64_t start, uint64_t end, 
-		    std::vector<uint64_t> &paths, 
-		    uint64_t firstLevelTraceStartAddr);
-void getReturnCode(vector<unsigned int> &traces, int &index, 
-		   uint64_t ret);
-void getBranchExitCode(std::vector<unsigned int> &instVec, 
-                       std::map<int, uint64_t> &branchMap, 
-                       std::map<int, uint64_t> &targetMap, 
-                       std::map<int, uint64_t> &callMap);
-
-std::map<uint64_t, int> exitCounter;
-std::map<uint64_t, uint64_t> firstTriggerAddr; //tracestart addr
-std::map<uint64_t, pair<long, long> > backOffCounters;
-
-/// This method is called when we have finally constructed a
-/// trace. The first parameter is the vector of basic blocks that form
-/// the trace; the second parameter is presumably one of the starting
-/// addresses for the trace.
-///
-void optimizeTrace (vector<BasicBlock *> &vBB, uint64_t a) {
-#ifdef GET_ALL_INFO
-  // Dump the trace to the standard error stream. 
-  std::cerr << "=== In optimizeTrace; a = " << a << "================\n";
-  std::cerr << "--- Function where the trace starts -----------------\n";
-  std::cerr << vBB[0]->getParent();
-  std::cerr << "--- BasicBlocks in the trace ------------------------\n";
-  for (unsigned i = 0; i < vBB.size(); ++i)
-    std::cerr << *vBB[i];
-  std::cerr << "=====================================================\n";
-#endif // GET_ALL_INFO
-}
-
+std::map<uint64_t, uint64_t> firstTriggerAddr;
+ 
 extern "C" void llvm_time_start(){
 #ifdef __sparc
   cpc_count_usr_events(1);




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:08:25 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:08:25 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Globals.h
Message-ID: <200308130307.h7D37vJ16333@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

Globals.h added (r1.1)

---
Log message:

New file to gather all the scattered global variables the Reoptimizer uses.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Globals.h
diff -c /dev/null llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Globals.h:1.1
*** /dev/null	Tue Aug 12 22:07:57 2003
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Globals.h	Tue Aug 12 22:06:17 2003
***************
*** 0 ****
--- 1,56 ----
+ //===- LightWtProfiling/Trigger/Globals.h - Reoptimizer Globals ---*- C++ -*-=//
+ //
+ // This file contains parameters and other global variables used by
+ // the reoptimizer. It is intended as a central place to gather
+ // together (and perhaps document) the global variables we use, until
+ // we actually get around to encapsulating the reoptimizer in its own
+ // class.
+ // 
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef GLOBALS_H
+ #define GLOBALS_H
+ 
+ #include "llvm/Reoptimizer/TraceCache.h"
+ #include "llvm/Reoptimizer/VirtualMem.h"
+ #include "llvm/Module.h"
+ 
+ /// Threshold against which back-edge counters are compared in first-level
+ /// instrumentation. If a back-edge's counter exceeds this threshold, we
+ /// may generate second-level instrumentation (SLI) for the loop.
+ ///
+ extern int reopt_threshold;
+ 
+ /// Another threshold used in SecondTrigger.cpp.
+ ///
+ extern long THRESHOLD_LEVEL_2;
+ 
+ /// If a trace selected as "hot" is exited more than a certain number
+ /// of times, then it will be rejected; this certain number is set to
+ /// 1/3 of the THRESHOLD_LEVEL_2 value.
+ ///
+ extern long LEVEL_TWO_EXITS; 
+ 
+ /// Second-level instrumented code cache.
+ ///
+ extern TraceCache *tr;
+ 
+ /// Final trace cache.
+ ///
+ extern TraceCache *tr2;
+ 
+ /// Interface by which code segment is read/written.
+ ///
+ extern VirtualMem *vm; 
+ 
+ /// Module being reoptimized.
+ ///
+ extern Module *M;
+ 
+ /// The current SPARC LLC writes the bytecode and its length into the
+ /// executable. We can access them via these global symbols.
+ ///
+ extern const unsigned char LLVMBytecode[];
+ extern int llvm_length;
+ 
+ #endif // GLOBALS_H




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:33:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:33:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp
Message-ID: <200308130332.h7D3W3G16514@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

SecondTrigger.cpp updated: 1.13 -> 1.14

---
Log message:

Remove several needless #includes and using directives.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.13 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.14
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp:1.13	Tue Aug 12 22:07:16 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/SecondTrigger.cpp	Tue Aug 12 22:31:53 2003
@@ -20,28 +20,17 @@
 #include "llvm/Reoptimizer/TraceCache.h"
 #include "llvm/Reoptimizer/GetTraceTime.h"
 #include "llvm/iTerminators.h"
-#include "llvm/Support/CFG.h"
-#include "llvm/Module.h"
-#include <sys/time.h>
-#include <sys/types.h>
-#include <cstdlib>
-#ifdef __sparc
 #include <libcpc.h>
-#endif
-
-using std::map;
-using std::vector;
-using std::pair;
 
 #define CALL 0x40000000
 
 static std::map<uint64_t, std::map<uint64_t, int> *> pathCounter;
 static std::map<uint64_t, int> totalCount;
 static std::map<uint64_t, int> exitCounter;
-static std::map<uint64_t, pair<long, long> > backOffCounters;
+static std::map<uint64_t, std::pair<long, long> > backOffCounters;
 
 extern "C" void llvm_first_trigger(int *cnt);
-extern void optimizeTrace (vector<BasicBlock *> &vBB, uint64_t a);
+extern void optimizeTrace (std::vector<BasicBlock *> &vBB, uint64_t a);
 
 std::map<uint64_t, uint64_t> firstTriggerAddr;
  
@@ -451,7 +440,8 @@
 /// address is START, construct in VBB a vector of LLVM BasicBlocks
 /// that represents the trace.
 ///
-void constructVBB (unsigned int path, uint64_t start, vector<BasicBlock *>&vBB){
+void constructVBB (unsigned int path, uint64_t start,
+                   std::vector<BasicBlock *> &vBB) {
   BasicBlock *bb;
   BasicBlock *startBB;
   // Get the first basic block by querying the mapping information.
@@ -523,7 +513,7 @@
   getPathIntersections(pathIntersections, paths);
 
   //use path 0 to form vBB
-  //vector<BasicBlock *> vBB;
+  //std::vector<BasicBlock *> vBB;
   //constructVBB (paths[0], start, vBB);
   //if (!vBB.empty()) { optimizeTrace (vBB, firstLevelTraceStartAddr); }
   //return;
@@ -948,7 +938,7 @@
   }
 }
 
-void getReturnCode(vector<unsigned int> &traces, int &index, uint64_t ret){
+void getReturnCode(std::vector<unsigned int> &traces, int &index, uint64_t ret){
   //sethi1
   unsigned int r1 = ((ret>>32)&(0xfffff000))>>10;
   unsigned int r2 = (ret>>32)&(0xfff);




From gaeke at niobe.cs.uiuc.edu  Tue Aug 12 22:36:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Tue Aug 12 22:36:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp
Message-ID: <200308130335.h7D3Z5e16544@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

FirstTrigger.cpp updated: 1.11 -> 1.12

---
Log message:

Remove some unneeded #includes.


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp
diff -u llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp:1.11 llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp:1.12
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp:1.11	Tue Aug 12 22:05:45 2003
+++ llvm/lib/Reoptimizer/LightWtProfiling/Trigger/FirstTrigger.cpp	Tue Aug 12 22:34:55 2003
@@ -18,14 +18,6 @@
 #include "llvm/Reoptimizer/VirtualMem.h"
 #include "llvm/Reoptimizer/InstrUtils.h"
 #include "llvm/Reoptimizer/TraceCache.h"
-#include "llvm/Reoptimizer/GetTraceTime.h"
-#include "llvm/Reoptimizer/CFG.h"
-#include <sys/time.h>
-#include <cstdlib>
-#include <algorithm>
-#ifdef __sparc
-#include <libcpc.h>
-#endif
 
 /// This is the function that performs first-level profiling. A call
 /// to this function from most back-edges is inserted by the InstLoops




From lattner at cs.uiuc.edu  Tue Aug 12 23:19:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 23:19:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200308130418.XAA14331@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.112 -> 1.113

---
Log message:

Change cannonicalization rules: add X,X is represented as multiplies, multiplies
of a power of two are represented as a shift.


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.112 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.113
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.112	Tue Aug 12 16:53:41 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Tue Aug 12 23:18:28 2003
@@ -19,6 +19,9 @@
 //       shifts are performed first, then or's, then and's, then xor's.
 //    3. SetCC instructions are converted from <,>,<=,>= to ==,!= if possible
 //    4. All SetCC instructions on boolean values are replaced with logical ops
+//    5. add X, X is represented as (X*2) => (X << 1)
+//    6. Multiplies with a power-of-two constant argument are transformed into
+//       shifts.
 //    N. This list is incomplete
 //
 //===----------------------------------------------------------------------===//
@@ -272,6 +275,11 @@
   if (RHS == Constant::getNullValue(I.getType()))
     return ReplaceInstUsesWith(I, LHS);
 
+  // Convert 'add X, X' to 'shl X, 1'
+  if (LHS == RHS && I.getType()->isInteger())
+    return new ShiftInst(Instruction::Shl, LHS,
+                         ConstantInt::get(Type::UByteTy, 1));
+
   // -A + B  -->  B - A
   if (Value *V = dyn_castNegVal(LHS))
     return BinaryOperator::create(Instruction::Sub, RHS, V);
@@ -390,6 +398,14 @@
   // Simplify mul instructions with a constant RHS...
   if (Constant *Op1 = dyn_cast<Constant>(I.getOperand(1))) {
     if (ConstantInt *CI = dyn_cast<ConstantInt>(Op1)) {
+
+      // ((X << C1)*C2) == (X * (C2 << C1))
+      if (ShiftInst *SI = dyn_cast<ShiftInst>(Op0))
+        if (SI->getOpcode() == Instruction::Shl)
+          if (Constant *ShOp = dyn_cast<Constant>(SI->getOperand(1)))
+            return BinaryOperator::create(Instruction::Mul, SI->getOperand(0),
+                                          *CI << *ShOp);
+
       const Type *Ty = CI->getType();
       int64_t Val = (int64_t)cast<ConstantInt>(CI)->getRawValue();
       switch (Val) {
@@ -399,8 +415,6 @@
         return ReplaceInstUsesWith(I, Op1);  // Eliminate 'mul double %X, 0'
       case 1:
         return ReplaceInstUsesWith(I, Op0);  // Eliminate 'mul int %X, 1'
-      case 2:                     // Convert 'mul int %X, 2' to 'add int %X, %X'
-        return BinaryOperator::create(Instruction::Add, Op0, Op0, I.getName());
       }
 
       if (uint64_t C = Log2(Val))            // Replace X*(2^C) with X << C
@@ -902,6 +916,14 @@
         (!Op0->getType()->isSigned() || isLeftShift))
       return ReplaceInstUsesWith(I, Constant::getNullValue(Op0->getType()));
 
+    // ((X*C1) << C2) == (X * (C1 << C2))
+    if (BinaryOperator *BO = dyn_cast<BinaryOperator>(Op0))
+      if (BO->getOpcode() == Instruction::Mul && isLeftShift)
+        if (Constant *BOOp = dyn_cast<Constant>(BO->getOperand(1)))
+          return BinaryOperator::create(Instruction::Mul, BO->getOperand(0),
+                                        *BOOp << *CUI);
+    
+
     // If the operand is an bitwise operator with a constant RHS, and the
     // shift is the only use, we can pull it out of the shift.
     if (Op0->use_size() == 1)
@@ -989,12 +1011,6 @@
           }
         }
       }
-
-    // Check to see if we are shifting left by 1.  If so, turn it into an add
-    // instruction.
-    if (isLeftShift && CUI->equalsInt(1))
-      // Convert 'shl int %X, 1' to 'add int %X, %X'
-      return BinaryOperator::create(Instruction::Add, Op0, Op0, I.getName());
   }
 
   return 0;




From lattner at cs.uiuc.edu  Tue Aug 12 23:21:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Aug 12 23:21:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/shift.ll
Message-ID: <200308130420.XAA14346@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

shift.ll updated: 1.12 -> 1.13

---
Log message:

Update test to represent new cannonicalization rules for multiplies


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/shift.ll
diff -u llvm/test/Regression/Transforms/InstCombine/shift.ll:1.12 llvm/test/Regression/Transforms/InstCombine/shift.ll:1.13
--- llvm/test/Regression/Transforms/InstCombine/shift.ll:1.12	Tue Aug 12 16:22:51 2003
+++ llvm/test/Regression/Transforms/InstCombine/shift.ll	Tue Aug 12 23:20:06 2003
@@ -36,8 +36,9 @@
 }
 
 uint %test6(uint %A) {
-	%B = shl uint %A, ubyte 1   ;; convert to an add instruction
-	ret uint %B
+	%B = shl uint %A, ubyte 1   ;; convert to an mul instruction
+	%C = mul uint %B, 3
+	ret uint %C
 }
 
 int %test7(ubyte %A) {
@@ -64,7 +65,8 @@
 }
 
 ubyte %test11(ubyte %A) {              ;; (A >> 3) << 4 === (A & 0x1F) << 1
-	%B = shr ubyte %A, ubyte 3
+	%a = mul ubyte %A, 3
+	%B = shr ubyte %a, ubyte 3
 	%C = shl ubyte %B, ubyte 4
 	ret ubyte %C
 }
@@ -76,7 +78,8 @@
 }
 
 sbyte %test13(sbyte %A) {           ;; (A >> 3) << 4 === (A & -8) * 2
-	%B = shr sbyte %A, ubyte 3
+	%a = mul sbyte %A, 3
+	%B = shr sbyte %a, ubyte 3
 	%C = shl sbyte %B, ubyte 4
 	ret sbyte %C
 }




From lattner at cs.uiuc.edu  Wed Aug 13 00:29:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 00:29:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/add.ll and.ll cast.ll set.ll sub.ll xor.ll
Message-ID: <200308130528.AAA22121@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

add.ll updated: 1.11 -> 1.12
and.ll updated: 1.14 -> 1.15
cast.ll updated: 1.12 -> 1.13
set.ll updated: 1.11 -> 1.12
sub.ll updated: 1.11 -> 1.12
xor.ll updated: 1.3 -> 1.4

---
Log message:

Reorganize tests because we no longer cannonicalize X != 0 -> cast X to bool
In fact, we plan to eliminate cast to bool entirely.


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/add.ll
diff -u llvm/test/Regression/Transforms/InstCombine/add.ll:1.11 llvm/test/Regression/Transforms/InstCombine/add.ll:1.12
--- llvm/test/Regression/Transforms/InstCombine/add.ll:1.11	Thu Jul 24 14:44:51 2003
+++ llvm/test/Regression/Transforms/InstCombine/add.ll	Wed Aug 13 00:27:57 2003
@@ -60,3 +60,15 @@
 	%C = add int %B, %B      ; === shl int %A, 5
 	ret int %C
 }
+
+bool %test10(ubyte %A, ubyte %b) {
+        %B = add ubyte %A, %b
+        %c = setne ubyte %B, 0    ; === A != -b
+        ret bool %c
+}
+
+bool %test11(ubyte %A) {
+        %B = add ubyte %A, 255
+        %c = setne ubyte %B, 0    ; === A != 1
+        ret bool %c
+}


Index: llvm/test/Regression/Transforms/InstCombine/and.ll
diff -u llvm/test/Regression/Transforms/InstCombine/and.ll:1.14 llvm/test/Regression/Transforms/InstCombine/and.ll:1.15
--- llvm/test/Regression/Transforms/InstCombine/and.ll:1.14	Thu Jul 24 14:44:51 2003
+++ llvm/test/Regression/Transforms/InstCombine/and.ll	Wed Aug 13 00:27:57 2003
@@ -88,3 +88,8 @@
 	ret bool %D
 }
 
+bool %test14(ubyte %A) {
+	%B = and ubyte %A, 128
+	%C = setne ubyte %B, 0
+	ret bool %C
+}


Index: llvm/test/Regression/Transforms/InstCombine/cast.ll
diff -u llvm/test/Regression/Transforms/InstCombine/cast.ll:1.12 llvm/test/Regression/Transforms/InstCombine/cast.ll:1.13
--- llvm/test/Regression/Transforms/InstCombine/cast.ll:1.12	Tue Jul 22 16:44:06 2003
+++ llvm/test/Regression/Transforms/InstCombine/cast.ll	Wed Aug 13 00:27:57 2003
@@ -66,26 +66,3 @@
 	ret short %c2
 }
 
-bool %test11(ubyte %A, ubyte %B) {
-        %C = sub ubyte %A, %B
-        %cD = cast ubyte %C to bool    ; == setne A, B
-        ret bool %cD
-}
-
-bool %test12(ubyte %A) {
-        %B = add ubyte %A, 255
-        %c = cast ubyte %B to bool    ; === A != 1
-        ret bool %c
-}
-
-bool %test13(ubyte %A, ubyte %b) {
-        %B = add ubyte %A, %b
-        %c = cast ubyte %B to bool    ; === A != -b
-        ret bool %c
-}
-
-bool %test14(ubyte %A) {
-	%B = xor ubyte %A, 4
-	%c = cast ubyte %B to bool
-	ret bool %c
-}


Index: llvm/test/Regression/Transforms/InstCombine/set.ll
diff -u llvm/test/Regression/Transforms/InstCombine/set.ll:1.11 llvm/test/Regression/Transforms/InstCombine/set.ll:1.12
--- llvm/test/Regression/Transforms/InstCombine/set.ll:1.11	Wed Jul 23 12:01:18 2003
+++ llvm/test/Regression/Transforms/InstCombine/set.ll	Wed Aug 13 00:27:57 2003
@@ -75,18 +75,6 @@
 	ret bool %C
 }
 
-; These instructions can be turned into cast-to-bool
-bool %test15(sbyte %A, short %A, int %A, long %A) {
-	%B1 = setne sbyte %A, 0
-	%B2 = seteq short %A, 0
-	%B3 = setne int %A, 0
-	%B4 = seteq long %A, 0
-	%C1 = or bool %B1, %B2
-	%C2 = or bool %B3, %B4
-	%D = or bool %C1, %C2
-	ret bool %D
-}
-
 bool %test16(uint %A) {
 	%B = and uint %A, 5
 	%C = seteq uint %B, 8    ; Is never true


Index: llvm/test/Regression/Transforms/InstCombine/sub.ll
diff -u llvm/test/Regression/Transforms/InstCombine/sub.ll:1.11 llvm/test/Regression/Transforms/InstCombine/sub.ll:1.12
--- llvm/test/Regression/Transforms/InstCombine/sub.ll:1.11	Sat Jun 28 18:31:56 2003
+++ llvm/test/Regression/Transforms/InstCombine/sub.ll	Wed Aug 13 00:27:57 2003
@@ -69,3 +69,8 @@
 	ret int %E
 }
 
+bool %test11(ubyte %A, ubyte %B) {
+        %C = sub ubyte %A, %B
+        %cD = setne ubyte %C, 0    ; == setne A, B
+        ret bool %cD
+}


Index: llvm/test/Regression/Transforms/InstCombine/xor.ll
diff -u llvm/test/Regression/Transforms/InstCombine/xor.ll:1.3 llvm/test/Regression/Transforms/InstCombine/xor.ll:1.4
--- llvm/test/Regression/Transforms/InstCombine/xor.ll:1.3	Wed Jul 23 16:36:01 2003
+++ llvm/test/Regression/Transforms/InstCombine/xor.ll	Wed Aug 13 00:27:57 2003
@@ -78,3 +78,9 @@
 	%C = xor ubyte %B, 4        ; transform into an AND
 	ret ubyte %C
 }
+
+bool %test12(ubyte %A) {
+	%B = xor ubyte %A, 4
+	%c = setne ubyte %B, 0
+	ret bool %c
+}




From lattner at cs.uiuc.edu  Wed Aug 13 00:34:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 00:34:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200308130533.AAA25897@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.113 -> 1.114

---
Log message:

Do not cannonicalize (X != 0) into (cast X to bool)


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.113 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.114
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.113	Tue Aug 12 23:18:28 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Wed Aug 13 00:33:12 2003
@@ -814,35 +814,83 @@
         I.getOpcode() == Instruction::SetNE) {
       bool isSetNE = I.getOpcode() == Instruction::SetNE;
 
-      if (CI->isNullValue()) {   // Simplify [seteq|setne] X, 0
-        CastInst *Val = new CastInst(Op0, Type::BoolTy, I.getName()+".not");
-        if (isSetNE) return Val;
-
-        // seteq X, 0 -> not (cast X to bool)
-        InsertNewInstBefore(Val, I);
-        return BinaryOperator::createNot(Val, I.getName());
-      }
-
       // If the first operand is (and|or|xor) with a constant, and the second
       // operand is a constant, simplify a bit.
-      if (BinaryOperator *BO = dyn_cast<BinaryOperator>(Op0))
-        if (ConstantInt *BOC = dyn_cast<ConstantInt>(BO->getOperand(1)))
-          if (BO->getOpcode() == Instruction::Or) {
-            // If bits are being or'd in that are not present in the constant we
-            // are comparing against, then the comparison could never succeed!
+      if (BinaryOperator *BO = dyn_cast<BinaryOperator>(Op0)) {
+        switch (BO->getOpcode()) {
+        case Instruction::Add:
+          if (CI->isNullValue()) {
+            // Replace ((add A, B) != 0) with (A != -B) if A or B is
+            // efficiently invertible, or if the add has just this one use.
+            Value *BOp0 = BO->getOperand(0), *BOp1 = BO->getOperand(1);
+            if (Value *NegVal = dyn_castNegVal(BOp1))
+              return new SetCondInst(I.getOpcode(), BOp0, NegVal);
+            else if (Value *NegVal = dyn_castNegVal(BOp0))
+              return new SetCondInst(I.getOpcode(), NegVal, BOp1);
+            else if (BO->use_size() == 1) {
+              Instruction *Neg = BinaryOperator::createNeg(BOp1, BO->getName());
+              BO->setName("");
+              InsertNewInstBefore(Neg, I);
+              return new SetCondInst(I.getOpcode(), BOp0, Neg);
+            }
+          }
+          break;
+        case Instruction::Xor:
+          // For the xor case, we can xor two constants together, eliminating
+          // the explicit xor.
+          if (Constant *BOC = dyn_cast<Constant>(BO->getOperand(1)))
+            return BinaryOperator::create(I.getOpcode(), BO->getOperand(0),
+                                          *CI ^ *BOC);
+
+          // FALLTHROUGH
+        case Instruction::Sub:
+          // Replace (([sub|xor] A, B) != 0) with (A != B)
+          if (CI->isNullValue())
+            return new SetCondInst(I.getOpcode(), BO->getOperand(0),
+                                   BO->getOperand(1));
+          break;
+
+        case Instruction::Or:
+          // If bits are being or'd in that are not present in the constant we
+          // are comparing against, then the comparison could never succeed!
+          if (Constant *BOC = dyn_cast<Constant>(BO->getOperand(1)))
             if (!(*BOC & *~*CI)->isNullValue())
               return ReplaceInstUsesWith(I, ConstantBool::get(isSetNE));
-          } else if (BO->getOpcode() == Instruction::And) {
+          break;
+
+        case Instruction::And:
+          if (ConstantInt *BOC = dyn_cast<ConstantInt>(BO->getOperand(1))) {
             // If bits are being compared against that are and'd out, then the
             // comparison can never succeed!
             if (!(*CI & *~*BOC)->isNullValue())
               return ReplaceInstUsesWith(I, ConstantBool::get(isSetNE));
-          } else if (BO->getOpcode() == Instruction::Xor) {
-            // For the xor case, we can always just xor the two constants
-            // together, potentially eliminating the explicit xor.
-            return BinaryOperator::create(I.getOpcode(), BO->getOperand(0),
-                                          *CI ^ *BOC);
+
+            // Replace (and X, (1 << size(X)-1) != 0) with x < 0, converting X
+            // to be a signed value as appropriate.
+            if (isSignBit(BOC)) {
+              Value *X = BO->getOperand(0);
+              // If 'X' is not signed, insert a cast now...
+              if (!BOC->getType()->isSigned()) {
+                const Type *DestTy;
+                switch (BOC->getType()->getPrimitiveID()) {
+                case Type::UByteTyID:  DestTy = Type::SByteTy; break;
+                case Type::UShortTyID: DestTy = Type::ShortTy; break;
+                case Type::UIntTyID:   DestTy = Type::IntTy;   break;
+                case Type::ULongTyID:  DestTy = Type::LongTy;  break;
+                default: assert(0 && "Invalid unsigned integer type!"); abort();
+                }
+                CastInst *NewCI = new CastInst(X,DestTy,X->getName()+".signed");
+                InsertNewInstBefore(NewCI, I);
+                X = NewCI;
+              }
+              return new SetCondInst(isSetNE ? Instruction::SetLT :
+                                         Instruction::SetGE, X,
+                                     Constant::getNullValue(X->getType()));
+            }
           }
+        default: break;
+        }
+      }
     }
 
     // Check to see if we are comparing against the minimum or maximum value...
@@ -1161,65 +1209,6 @@
     if (AllZeroOperands) {
       CI.setOperand(0, GEP->getOperand(0));
       return &CI;
-    }
-  }
-
-  // If this is a cast to bool (which is effectively a "!=0" test), then we can
-  // perform a few optimizations...
-  //
-  if (CI.getType() == Type::BoolTy) {
-    if (BinaryOperator *BO = dyn_cast<BinaryOperator>(Src)) {
-      Value *Op0 = BO->getOperand(0), *Op1 = BO->getOperand(1);
-
-      switch (BO->getOpcode()) {
-      case Instruction::Sub:
-      case Instruction::Xor:
-        // Replace (cast ([sub|xor] A, B) to bool) with (setne A, B)
-        return new SetCondInst(Instruction::SetNE, Op0, Op1);
-
-      // Replace (cast (add A, B) to bool) with (setne A, -B) if B is
-      // efficiently invertible, or if the add has just this one use.
-      case Instruction::Add:
-        if (Value *NegVal = dyn_castNegVal(Op1))
-          return new SetCondInst(Instruction::SetNE, Op0, NegVal);
-        else if (Value *NegVal = dyn_castNegVal(Op0))
-          return new SetCondInst(Instruction::SetNE, NegVal, Op1);
-        else if (BO->use_size() == 1) {
-          Instruction *Neg = BinaryOperator::createNeg(Op1, BO->getName());
-          BO->setName("");
-          InsertNewInstBefore(Neg, CI);
-          return new SetCondInst(Instruction::SetNE, Op0, Neg);
-        }
-        break;
-
-      case Instruction::And:
-        // Replace (cast (and X, (1 << size(X)-1)) to bool) with x < 0,
-        // converting X to be a signed value as appropriate.  Don't worry about
-        // bool values, as they will be optimized other ways if they occur in
-        // this configuration.
-        if (ConstantInt *CInt = dyn_cast<ConstantInt>(Op1))
-          if (isSignBit(CInt)) {
-            // If 'X' is not signed, insert a cast now...
-            if (!CInt->getType()->isSigned()) {
-              const Type *DestTy;
-              switch (CInt->getType()->getPrimitiveID()) {
-              case Type::UByteTyID:  DestTy = Type::SByteTy; break;
-              case Type::UShortTyID: DestTy = Type::ShortTy; break;
-              case Type::UIntTyID:   DestTy = Type::IntTy;   break;
-              case Type::ULongTyID:  DestTy = Type::LongTy;  break;
-              default: assert(0 && "Invalid unsigned integer type!"); abort();
-              }
-              CastInst *NewCI = new CastInst(Op0, DestTy,
-                                             Op0->getName()+".signed");
-              InsertNewInstBefore(NewCI, CI);
-              Op0 = NewCI;
-            }
-            return new SetCondInst(Instruction::SetLT, Op0,
-                                   Constant::getNullValue(Op0->getType()));
-          }
-        break;
-      default: break;
-      }
     }
   }
 




From lattner at cs.uiuc.edu  Wed Aug 13 00:40:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 00:40:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200308130538.AAA27864@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.114 -> 1.115

---
Log message:

Implement InstCombine/2003-08-12-AllocaNonNull.ll


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.114 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.115
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.114	Wed Aug 13 00:33:12 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Wed Aug 13 00:38:46 2003
@@ -768,9 +768,11 @@
   if (Op0 == Op1)
     return ReplaceInstUsesWith(I, ConstantBool::get(isTrueWhenEqual(I)));
 
-  // setcc <global*>, 0 - Global value addresses are never null!
-  if (isa<GlobalValue>(Op0) && isa<ConstantPointerNull>(Op1))
+  // setcc <global/alloca*>, 0 - Global/Stack value addresses are never null!
+  if (isa<ConstantPointerNull>(Op1) && 
+      (isa<GlobalValue>(Op0) || isa<AllocaInst>(Op0)))
     return ReplaceInstUsesWith(I, ConstantBool::get(!isTrueWhenEqual(I)));
+
 
   // setcc's with boolean values can always be turned into bitwise operations
   if (Ty == Type::BoolTy) {




From kowshik at cs.uiuc.edu  Wed Aug 13 10:24:02 2003
From: kowshik at cs.uiuc.edu (Sumant Kowshik)
Date: Wed Aug 13 10:24:02 2003
Subject: [llvm-commits] CVS: poolalloc/bytecode/PoolAllocator/PoolAllocatorChained.c
Message-ID: <200308131523.KAA20892@apoc.cs.uiuc.edu>


Changes in directory poolalloc/bytecode/PoolAllocator:

PoolAllocatorChained.c updated: 1.3 -> 1.4

---
Log message:

Added exit statement upon exception in poolfree

---
Diffs of the changes:

Index: poolalloc/bytecode/PoolAllocator/PoolAllocatorChained.c
diff -u poolalloc/bytecode/PoolAllocator/PoolAllocatorChained.c:1.3 poolalloc/bytecode/PoolAllocator/PoolAllocatorChained.c:1.4
--- poolalloc/bytecode/PoolAllocator/PoolAllocatorChained.c:1.3	Thu Aug  7 00:31:04 2003
+++ poolalloc/bytecode/PoolAllocator/PoolAllocatorChained.c	Wed Aug 13 10:23:20 2003
@@ -242,6 +242,7 @@
     
     if (!ALLOCATION_BEGINS(PS, Idx)) { 
       printf("poolfree: Attempt to free middle of allocated array\n");
+      exit(1);
     }
 
     /* Free the first node */




From kowshik at cs.uiuc.edu  Wed Aug 13 10:26:02 2003
From: kowshik at cs.uiuc.edu (Sumant Kowshik)
Date: Wed Aug 13 10:26:02 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
Message-ID: <200308131525.KAA22382@apoc.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.17 -> 1.18

---
Log message:

Fixed problem with nodes pointed to by globals, ensuring their pools are initialized in main alone

---
Diffs of the changes:

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.17 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.18
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.17	Tue Aug 12 13:17:29 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Wed Aug 13 10:25:47 2003
@@ -6,7 +6,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "PoolAllocation"
-#include "poolalloc/PoolAllocate.h"
+#include "llvm/Transforms/PoolAllocate.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Analysis/DataStructure.h"
 #include "llvm/Analysis/DSGraph.h"




From criswell at cs.uiuc.edu  Wed Aug 13 10:37:02 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed Aug 13 10:37:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.poolalloc.Makefile
Message-ID: <200308131536.KAA04132@choi.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.poolalloc.Makefile (r1.3) removed

---
Log message:

Removing the pool allocator from the main CVS tree.
Use the poolalloc module in CVS from now on.



---
Diffs of the changes:



From criswell at cs.uiuc.edu  Wed Aug 13 10:37:07 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed Aug 13 10:37:07 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libpoolalloc/Makefile PoolAllocatorChained.c
Message-ID: <200308131536.KAA04125@choi.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libpoolalloc:

Makefile (r1.1) removed
PoolAllocatorChained.c (r1.4) removed

---
Log message:

Removing the pool allocator from the main CVS tree.
Use the poolalloc module in CVS from now on.



---
Diffs of the changes:



From criswell at cs.uiuc.edu  Wed Aug 13 10:37:11 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed Aug 13 10:37:11 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/PoolAllocate.h
Message-ID: <200308131536.KAA04112@choi.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms:

PoolAllocate.h (r1.6) removed

---
Log message:

Removing the pool allocator from the main CVS tree.
Use the poolalloc module in CVS from now on.



---
Diffs of the changes:



From criswell at cs.uiuc.edu  Wed Aug 13 10:37:16 2003
From: criswell at cs.uiuc.edu (John Criswell)
Date: Wed Aug 13 10:37:16 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/OldPoolAllocate.cpp PoolAllocate.cpp
Message-ID: <200308131536.KAA04119@choi.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

OldPoolAllocate.cpp (r1.45) removed
PoolAllocate.cpp (r1.16) removed

---
Log message:

Removing the pool allocator from the main CVS tree.
Use the poolalloc module in CVS from now on.



---
Diffs of the changes:



From kowshik at cs.uiuc.edu  Wed Aug 13 10:48:02 2003
From: kowshik at cs.uiuc.edu (Sumant Kowshik)
Date: Wed Aug 13 10:48:02 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
Message-ID: <200308131547.KAA03624@apoc.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.18 -> 1.19

---
Log message:

Corrected include problem

---
Diffs of the changes:

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.18 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.19
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.18	Wed Aug 13 10:25:47 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Wed Aug 13 10:46:57 2003
@@ -6,7 +6,7 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "PoolAllocation"
-#include "llvm/Transforms/PoolAllocate.h"
+#include "poolalloc/PoolAllocate.h"
 #include "llvm/Transforms/Utils/Cloning.h"
 #include "llvm/Analysis/DataStructure.h"
 #include "llvm/Analysis/DSGraph.h"




From lattner at cs.uiuc.edu  Wed Aug 13 10:53:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 10:53:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/ConstantHandling.cpp
Message-ID: <200308131552.KAA04683@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

ConstantHandling.cpp updated: 1.32 -> 1.33

---
Log message:

Implement constant folding of casts from boolean constants to other values


---
Diffs of the changes:

Index: llvm/lib/VMCore/ConstantHandling.cpp
diff -u llvm/lib/VMCore/ConstantHandling.cpp:1.32 llvm/lib/VMCore/ConstantHandling.cpp:1.33
--- llvm/lib/VMCore/ConstantHandling.cpp:1.32	Thu Jun 26 00:22:45 2003
+++ llvm/lib/VMCore/ConstantHandling.cpp	Wed Aug 13 10:52:25 2003
@@ -344,6 +344,25 @@
   static Constant *Xor(const ConstantBool *V1, const ConstantBool *V2) {
     return ConstantBool::get(V1->getValue() ^ V2->getValue());
   }
+
+  // Casting operators.  ick
+#define DEF_CAST(TYPE, CLASS, CTYPE) \
+  static CLASS *CastTo##TYPE  (const ConstantBool *V) {    \
+    return CLASS::get(Type::TYPE##Ty, (CTYPE)(bool)V->getValue()); \
+  }
+
+  DEF_CAST(Bool  , ConstantBool, bool)
+  DEF_CAST(SByte , ConstantSInt, signed char)
+  DEF_CAST(UByte , ConstantUInt, unsigned char)
+  DEF_CAST(Short , ConstantSInt, signed short)
+  DEF_CAST(UShort, ConstantUInt, unsigned short)
+  DEF_CAST(Int   , ConstantSInt, signed int)
+  DEF_CAST(UInt  , ConstantUInt, unsigned int)
+  DEF_CAST(Long  , ConstantSInt, int64_t)
+  DEF_CAST(ULong , ConstantUInt, uint64_t)
+  DEF_CAST(Float , ConstantFP  , float)
+  DEF_CAST(Double, ConstantFP  , double)
+#undef DEF_CAST
 };
 
 




From lattner at cs.uiuc.edu  Wed Aug 13 11:17:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 11:17:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/Reassociate.cpp
Message-ID: <200308131616.LAA32027@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

Reassociate.cpp updated: 1.21 -> 1.22

---
Log message:

Assign arguments different ranks so they get grouped together


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/Reassociate.cpp
diff -u llvm/lib/Transforms/Scalar/Reassociate.cpp:1.21 llvm/lib/Transforms/Scalar/Reassociate.cpp:1.22
--- llvm/lib/Transforms/Scalar/Reassociate.cpp:1.21	Tue Aug 12 16:45:24 2003
+++ llvm/lib/Transforms/Scalar/Reassociate.cpp	Wed Aug 13 11:16:26 2003
@@ -37,7 +37,7 @@
 
   class Reassociate : public FunctionPass {
     std::map<BasicBlock*, unsigned> RankMap;
-    std::map<Instruction*, unsigned> InstRankMap;
+    std::map<Value*, unsigned> ValueRankMap;
   public:
     bool runOnFunction(Function &F);
 
@@ -58,6 +58,11 @@
 
 void Reassociate::BuildRankMap(Function &F) {
   unsigned i = 2;
+
+  // Assign distinct ranks to function arguments
+  for (Function::aiterator I = F.abegin(), E = F.aend(); I != E; ++I)
+    ValueRankMap[I] = ++i;
+
   ReversePostOrderTraversal<Function*> RPOT(&F);
   for (ReversePostOrderTraversal<Function*>::rpo_iterator I = RPOT.begin(),
          E = RPOT.end(); I != E; ++I)
@@ -65,7 +70,8 @@
 }
 
 unsigned Reassociate::getRank(Value *V) {
-  if (isa<Argument>(V)) return 1;   // Function argument...
+  if (isa<Argument>(V)) return ValueRankMap[V];   // Function argument...
+
   if (Instruction *I = dyn_cast<Instruction>(V)) {
     // If this is an expression, return the 1+MAX(rank(LHS), rank(RHS)) so that
     // we can reassociate expressions for code motion!  Since we do not recurse
@@ -78,7 +84,7 @@
         I->mayWriteToMemory())  // Cannot move inst if it writes to memory!
       return RankMap[I->getParent()];
 
-    unsigned &CachedRank = InstRankMap[I];
+    unsigned &CachedRank = ValueRankMap[I];
     if (CachedRank) return CachedRank;    // Rank already known?
 
     // If not, compute it!
@@ -278,6 +284,6 @@
 
   // We are done with the rank map...
   RankMap.clear();
-  InstRankMap.clear();
+  ValueRankMap.clear();
   return Changed;
 }




From brukman at cs.uiuc.edu  Wed Aug 13 12:36:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Aug 13 12:36:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.Makefile
Message-ID: <200308131735.MAA17234@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.19 -> 1.20

---
Log message:

* Use `printf' instead of `echo -n': echo on Solaris does not respect -n.
* vim:... interprets all text to the end of line, so put vim filetype marker at
  the end of the line with no more decorations after it.


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.19 llvm/test/Programs/TEST.nightly.Makefile:1.20
--- llvm/test/Programs/TEST.nightly.Makefile:1.19	Thu Jun 26 15:26:14 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Wed Aug 13 12:34:56 2003
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.nightly.Makefile -----------------*- Makefile -*-===##
+##===- test/Programs/TEST.nightly.Makefile --*- Makefile -*-=======- vim:ft=make
 #
 # This test is used in conjunction with the llvm/utils/NightlyTest* stuff to
 # generate information about program status for the nightly report.
@@ -26,14 +26,14 @@
 	@-if ($(LGCCAS) Output/$*.linked.rll -o /dev/null $(TIMEOPT) >> $@ 2>&1)\
 	;then \
 	  echo "TEST-PASS: compile $(RELDIR)/$*" >> $@;\
-	  echo -n "TEST-RESULT-compile: " >> $@;\
+	  printf "TEST-RESULT-compile: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  echo >> $@;\
-	  echo -n "TEST-RESULT-compile: " >> $@;\
+	  printf "TEST-RESULT-compile: " >> $@;\
 	  wc -c $< >> $@;\
 	  echo >> $@;\
 	  $(LANALYZE) -stats -instcount $< -info-output-file=Output/$*.ic;\
-	  echo -n "TEST-RESULT-compile: " >> $@;\
+	  printf "TEST-RESULT-compile: " >> $@;\
 	  grep 'Number of instructions (of all types)$$' Output/$*.ic >> $@;\
 	  echo >> $@;\
 	else \
@@ -45,7 +45,7 @@
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.nat.report.txt): \
 Output/%.nightly.nat.report.txt: Output/%.out-nat
 	@echo > $@
-	echo -n "TEST-RESULT-nat-time: " >> $@
+	printf "TEST-RESULT-nat-time: " >> $@
 	-grep "^real" Output/$*.out-nat.time >> $@
 
 # LLC tests
@@ -55,10 +55,10 @@
 	@echo 'time -p $(LLC) -f $(TIMEOPT) $< -o /dev/null) > $@ 2>&1'
 	@-if (time -p $(LLC) -f $(TIMEOPT) $< -o /dev/null) >> $@ 2>&1; then \
 	  echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
-	  echo -n "TEST-RESULT-llc: " >> $@;\
+	  printf "TEST-RESULT-llc: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  echo >> $@;\
-	  echo -n "TEST-RESULT-llc: " >> $@;\
+	  printf "TEST-RESULT-llc: " >> $@;\
 	  grep "^real" $@ >> $@;\
 	  echo >> $@;\
 	else  \
@@ -74,7 +74,7 @@
 	@-if test -f Output/$*.exe-cbe; then \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
           echo "TEST-RESULT-cbe: YES" >> $@;\
-	  echo -n "TEST-RESULT-cbe-time: " >> $@;\
+	  printf "TEST-RESULT-cbe-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)cbe.time >> $@;\
 	  echo >> $@;\
         else  \
@@ -88,13 +88,13 @@
 	-head -n 100 Output/$*.exe-jit >> $@
 	@-if test -f Output/$*.exe-jit; then \
           echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
-	  echo -n "TEST-RESULT-jit-time: " >> $@;\
+	  printf "TEST-RESULT-jit-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)jit.time >> $@;\
 	  echo >> $@;\
-	  echo -n "TEST-RESULT-jit-comptime: " >> $@;\
+	  printf "TEST-RESULT-jit-comptime: " >> $@;\
 	  grep "Total Execution Time" $(INFO_PREFIX)jit.info >> $@;\
 	  echo >> $@;\
-	  echo -n "TEST-RESULT-jit-machcode: " >> $@;\
+	  printf "TEST-RESULT-jit-machcode: " >> $@;\
 	  grep "bytes of machine code compiled" $(INFO_PREFIX)jit.info >> $@;\
 	  echo >> $@;\
 	else  \




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:16:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:16:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/Printer.cpp
Message-ID: <200308131815.h7DIFts13632@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

Printer.cpp updated: 1.58 -> 1.59

---
Log message:

Factory methods for FunctionPasses now return type FunctionPass *.
Revert (to v1.55) one of the hunks of Chris's change that messed up the
 %-register workaround.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/Printer.cpp
diff -u llvm/lib/Target/X86/Printer.cpp:1.58 llvm/lib/Target/X86/Printer.cpp:1.59
--- llvm/lib/Target/X86/Printer.cpp:1.58	Mon Aug 11 15:06:16 2003
+++ llvm/lib/Target/X86/Printer.cpp	Wed Aug 13 13:15:15 2003
@@ -81,7 +81,7 @@
 /// using the given target machine description.  This should work
 /// regardless of whether the function is in SSA form.
 ///
-Pass *createX86CodePrinterPass(std::ostream &o, TargetMachine &tm) {
+FunctionPass *createX86CodePrinterPass(std::ostream &o,TargetMachine &tm){
   return new Printer(o, tm);
 }
 
@@ -461,10 +461,10 @@
     }
     // FALLTHROUGH
   case MachineOperand::MO_MachineRegister:
-    if (MO.getReg() < MRegisterInfo::FirstVirtualRegister) {
+    if (MO.getReg() < MRegisterInfo::FirstVirtualRegister)
       // Bug Workaround: See note in Printer::doInitialization about %.
-      O << RI.get(MO.getReg()).Name;
-    } else
+      O << "%" << RI.get(MO.getReg()).Name;
+    else
       O << "%reg" << MO.getReg();
     return;
 
@@ -918,9 +918,6 @@
   // before being looked up in the symbol table. This creates spurious
   // `undefined symbol' errors when linking. Workaround: Do not use `noprefix'
   // mode, and decorate all register names with percent signs.
-  //
-  // Cygwin presumably doesn't have this problem, so drop the %'s.
-  //
   O << "\t.intel_syntax\n";
   Mang = new Mangler(M, EmitCygwin);
   return false; // success




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:16:06 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:16:06 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86.h
Message-ID: <200308131815.h7DIFdV13622@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86.h updated: 1.18 -> 1.19

---
Log message:

Factory methods for FunctionPasses now return type FunctionPass *.
Correct one of the functions' comments.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86.h
diff -u llvm/lib/Target/X86/X86.h:1.18 llvm/lib/Target/X86/X86.h:1.19
--- llvm/lib/Target/X86/X86.h:1.18	Mon Aug 11 09:59:22 2003
+++ llvm/lib/Target/X86/X86.h	Wed Aug 13 13:15:29 2003
@@ -10,43 +10,43 @@
 
 #include <iosfwd>
 class TargetMachine;
-class Pass;
+class FunctionPass;
 
 /// createX86SimpleInstructionSelector - This pass converts an LLVM function
 /// into a machine code representation in a very simple peep-hole fashion.  The
 /// generated code sucks but the implementation is nice and simple.
 ///
-Pass *createX86SimpleInstructionSelector(TargetMachine &TM);
+FunctionPass *createX86SimpleInstructionSelector(TargetMachine &TM);
 
 /// createX86PatternInstructionSelector - This pass converts an LLVM function
 /// into a machine code representation using pattern matching and a machine
 /// description file.
 ///
-Pass *createX86PatternInstructionSelector(TargetMachine &TM);
+FunctionPass *createX86PatternInstructionSelector(TargetMachine &TM);
 
 /// createX86PeepholeOptimizer - Create a pass to perform X86 specific peephole
 /// optimizations.
 ///
-Pass *createX86PeepholeOptimizerPass();
+FunctionPass *createX86PeepholeOptimizerPass();
 
 /// createX86FloatingPointStackifierPass - This function returns a pass which
 /// converts floating point register references and pseudo instructions into
 /// floating point stack references and physical instructions.
 ///
-Pass *createX86FloatingPointStackifierPass();
+FunctionPass *createX86FloatingPointStackifierPass();
 
 /// createX86CodePrinterPass - Returns a pass that prints the X86
 /// assembly code for a MachineFunction to the given output stream,
 /// using the given target machine description.  This should work
 /// regardless of whether the function is in SSA form.
 ///
-Pass *createX86CodePrinterPass(std::ostream &o, TargetMachine &tm);
+FunctionPass *createX86CodePrinterPass(std::ostream &o,TargetMachine &tm);
 
-/// X86EmitCodeToMemory - This function converts a register allocated function
-/// into raw machine code in a dynamically allocated chunk of memory.  A pointer
-/// to the start of the function is returned.
+/// createX86EmitCodeToMemory - Returns a pass that converts a register
+/// allocated function into raw machine code in a dynamically
+/// allocated chunk of memory.
 ///
-Pass *createEmitX86CodeToMemory();
+FunctionPass *createEmitX86CodeToMemory();
 
 // Defines symbolic names for X86 registers.  This defines a mapping from
 // register name to register number.




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:17:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:17:01 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/JIT/VM.cpp
Message-ID: <200308131816.h7DIGiu13664@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/JIT:

VM.cpp updated: 1.6 -> 1.7

---
Log message:

Deconstify parameter to getPointerToFunction().
Run passes on single function (hey, just-in-time compilation!)
 instead of the entire module that contains it.


---
Diffs of the changes:

Index: llvm/tools/lli/JIT/VM.cpp
diff -u llvm/tools/lli/JIT/VM.cpp:1.6 llvm/tools/lli/JIT/VM.cpp:1.7
--- llvm/tools/lli/JIT/VM.cpp:1.6	Sun Jun  1 18:24:36 2003
+++ llvm/tools/lli/JIT/VM.cpp	Wed Aug 13 13:16:34 2003
@@ -39,7 +39,7 @@
 /// getPointerToFunction - This method is used to get the address of the
 /// specified function, compiling it if neccesary.
 ///
-void *VM::getPointerToFunction(const Function *F) {
+void *VM::getPointerToFunction(Function *F) {
   void *&Addr = GlobalAddress[F];   // Function already code gen'd
   if (Addr) return Addr;
 
@@ -49,11 +49,9 @@
   static bool isAlreadyCodeGenerating = false;
   assert(!isAlreadyCodeGenerating && "ERROR: RECURSIVE COMPILATION DETECTED!");
 
-  // FIXME: JIT all of the functions in the module.  Eventually this will JIT
-  // functions on demand.  This has the effect of populating all of the
-  // non-external functions into the GlobalAddress table.
+  // JIT the function
   isAlreadyCodeGenerating = true;
-  PM.run(getModule());
+  PM.run(*F);
   isAlreadyCodeGenerating = false;
 
   assert(Addr && "Code generation didn't add function to GlobalAddress table!");




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:17:07 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:17:07 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetMachine.cpp
Message-ID: <200308131816.h7DIG2Z13640@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86TargetMachine.cpp updated: 1.22 -> 1.23

---
Log message:

addPassesToJITCompile now takes a FunctionPassManager, to support
 function-at-a-time compilation and emission of code.
Separate addPassesToEmitAssembly from addPassesToJITCompile, because
 the latter requires you to use FunctionPasses, and the former might
 diverge anyway.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.22 llvm/lib/Target/X86/X86TargetMachine.cpp:1.23
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.22	Mon Aug 11 09:59:22 2003
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Wed Aug 13 13:15:52 2003
@@ -48,7 +48,44 @@
 // does to emit statically compiled machine code.
 bool X86TargetMachine::addPassesToEmitAssembly(PassManager &PM,
 					       std::ostream &Out) {
-  addPassesToJITCompile(PM);
+  // FIXME: Implement the switch instruction in the instruction selector!
+  PM.add(createLowerSwitchPass());
+
+  if (NoPatternISel)
+    PM.add(createX86SimpleInstructionSelector(*this));
+  else
+    PM.add(createX86PatternInstructionSelector(*this));
+
+  // TODO: optional optimizations go here
+
+  // FIXME: Add SSA based peephole optimizer here.
+
+  // Print the instruction selected machine code...
+  if (PrintCode)
+    PM.add(createMachineFunctionPrinterPass());
+
+  // Perform register allocation to convert to a concrete x86 representation
+  if (NoLocalRA)
+    PM.add(createSimpleRegisterAllocator());
+  else
+    PM.add(createLocalRegisterAllocator());
+
+  if (PrintCode)
+    PM.add(createMachineFunctionPrinterPass());
+
+  PM.add(createX86FloatingPointStackifierPass());
+
+  if (PrintCode)
+    PM.add(createMachineFunctionPrinterPass());
+
+  // Insert prolog/epilog code.  Eliminate abstract frame index references...
+  PM.add(createPrologEpilogCodeInserter());
+
+  PM.add(createX86PeepholeOptimizerPass());
+
+  if (PrintCode)  // Print the register-allocated code
+    PM.add(createX86CodePrinterPass(std::cerr, *this));
+
   PM.add(createX86CodePrinterPass(Out, *this));
   return false; // success!
 }
@@ -57,7 +94,7 @@
 /// implement a fast dynamic compiler for this target.  Return true if this is
 /// not supported for this target.
 ///
-bool X86TargetMachine::addPassesToJITCompile(PassManager &PM) {
+bool X86TargetMachine::addPassesToJITCompile(FunctionPassManager &PM) {
   // FIXME: Implement the switch instruction in the instruction selector!
   PM.add(createLowerSwitchPass());
 




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:17:11 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:17:11 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.cpp
Message-ID: <200308131816.h7DIGOn13652@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

ExecutionEngine.cpp updated: 1.18 -> 1.19

---
Log message:

In ExecutionEngine::getPointerToGlobal(), throw away const qualifier
 on Function * when passing it to getPointerToFunction().


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.cpp
diff -u llvm/tools/lli/ExecutionEngine.cpp:1.18 llvm/tools/lli/ExecutionEngine.cpp:1.19
--- llvm/tools/lli/ExecutionEngine.cpp:1.18	Tue Aug  5 12:00:30 2003
+++ llvm/tools/lli/ExecutionEngine.cpp	Wed Aug 13 13:16:14 2003
@@ -22,7 +22,7 @@
 // value.  This may involve code generation if it's a function.
 //
 void *ExecutionEngine::getPointerToGlobal(const GlobalValue *GV) {
-  if (const Function *F = dyn_cast<Function>(GV))
+  if (Function *F = const_cast<Function*>(dyn_cast<Function>(GV)))
     return getPointerToFunction(F);
 
   assert(GlobalAddress[GV] && "Global hasn't had an address allocated yet?");




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:18:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:18:01 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/JIT/VM.h
Message-ID: <200308131817.h7DIH0c13676@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/JIT:

VM.h updated: 1.8 -> 1.9

---
Log message:

Deconstify parameter to getPointerToFunction().
Use a FunctionPassManager instead of a PassManager.


---
Diffs of the changes:

Index: llvm/tools/lli/JIT/VM.h
diff -u llvm/tools/lli/JIT/VM.h:1.8 llvm/tools/lli/JIT/VM.h:1.9
--- llvm/tools/lli/JIT/VM.h:1.8	Sun Jun  1 22:23:16 2003
+++ llvm/tools/lli/JIT/VM.h	Wed Aug 13 13:16:50 2003
@@ -19,7 +19,7 @@
 
 class VM : public ExecutionEngine {
   TargetMachine &TM;       // The current target we are compiling to
-  PassManager PM;          // Passes to compile a function
+  FunctionPassManager PM;  // Passes to compile a function
   MachineCodeEmitter *MCE; // MCE object
 
 public:
@@ -49,7 +49,7 @@
 
   /// getPointerToFunction - This returns the address of the specified function,
   /// compiling it if necessary.
-  void *getPointerToFunction(const Function *F);
+  void *getPointerToFunction(Function *F);
 
 private:
   static MachineCodeEmitter *createEmitter(VM &V);




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:18:08 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:18:08 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86CodeEmitter.cpp X86TargetMachine.h
Message-ID: <200308131817.h7DIHbj13701@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86CodeEmitter.cpp updated: 1.34 -> 1.35
X86TargetMachine.h updated: 1.10 -> 1.11

---
Log message:

addPassesToJITCompile and addPassesToEmitMachineCode now take a
 FunctionPassManager, to support function-at-a-time compilation and
 emission of code.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86CodeEmitter.cpp
diff -u llvm/lib/Target/X86/X86CodeEmitter.cpp:1.34 llvm/lib/Target/X86/X86CodeEmitter.cpp:1.35
--- llvm/lib/Target/X86/X86CodeEmitter.cpp:1.34	Mon Aug  4 19:48:46 2003
+++ llvm/lib/Target/X86/X86CodeEmitter.cpp	Wed Aug 13 13:17:27 2003
@@ -181,7 +181,7 @@
 /// of functions.  This method should returns true if machine code emission is
 /// not supported.
 ///
-bool X86TargetMachine::addPassesToEmitMachineCode(PassManager &PM,
+bool X86TargetMachine::addPassesToEmitMachineCode(FunctionPassManager &PM,
                                                   MachineCodeEmitter &MCE) {
   PM.add(new Emitter(MCE));
   return false;


Index: llvm/lib/Target/X86/X86TargetMachine.h
diff -u llvm/lib/Target/X86/X86TargetMachine.h:1.10 llvm/lib/Target/X86/X86TargetMachine.h:1.11
--- llvm/lib/Target/X86/X86TargetMachine.h:1.10	Wed Jun 18 16:43:21 2003
+++ llvm/lib/Target/X86/X86TargetMachine.h	Wed Aug 13 13:17:27 2003
@@ -9,6 +9,7 @@
 
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetFrameInfo.h"
+#include "llvm/PassManager.h"
 #include "X86InstrInfo.h"
 
 class X86TargetMachine : public TargetMachine {
@@ -32,15 +33,15 @@
   /// implement a fast dynamic compiler for this target.  Return true if this is
   /// not supported for this target.
   ///
-  virtual bool addPassesToJITCompile(PassManager &PM);
+  virtual bool addPassesToJITCompile(FunctionPassManager &PM);
 
   /// addPassesToEmitMachineCode - Add passes to the specified pass manager to
-  /// get machine code emitted.  This uses a MAchineCodeEmitter object to handle
+  /// get machine code emitted.  This uses a MachineCodeEmitter object to handle
   /// actually outputting the machine code and resolving things like the address
   /// of functions.  This method should returns true if machine code emission is
   /// not supported.
   ///
-  virtual bool addPassesToEmitMachineCode(PassManager &PM,
+  virtual bool addPassesToEmitMachineCode(FunctionPassManager &PM,
                                           MachineCodeEmitter &MCE);
   
   virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:18:13 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:18:13 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetMachine.h
Message-ID: <200308131817.h7DIHaV13691@niobe.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetMachine.h updated: 1.31 -> 1.32

---
Log message:

addPassesToJITCompile and addPassesToEmitMachineCode now take a
 FunctionPassManager, to support function-at-a-time compilation and
 emission of code.


---
Diffs of the changes:

Index: llvm/include/llvm/Target/TargetMachine.h
diff -u llvm/include/llvm/Target/TargetMachine.h:1.31 llvm/include/llvm/Target/TargetMachine.h:1.32
--- llvm/include/llvm/Target/TargetMachine.h:1.31	Tue Jun  3 10:28:40 2003
+++ llvm/include/llvm/Target/TargetMachine.h	Wed Aug 13 13:17:25 2003
@@ -19,6 +19,7 @@
 class TargetOptInfo;
 class MachineCodeEmitter;
 class MRegisterInfo;
+class FunctionPassManager;
 class PassManager;
 class Pass;
 
@@ -79,7 +80,7 @@
   /// implement a fast dynamic compiler for this target.  Return true if this is
   /// not supported for this target.
   ///
-  virtual bool addPassesToJITCompile(PassManager &PM) { return true; }
+  virtual bool addPassesToJITCompile(FunctionPassManager &PM) { return true; }
 
   /// addPassesToEmitAssembly - Add passes to the specified pass manager to get
   /// assembly langage code emitted.  Typically this will involve several steps
@@ -91,12 +92,12 @@
   }
 
   /// addPassesToEmitMachineCode - Add passes to the specified pass manager to
-  /// get machine code emitted.  This uses a MAchineCodeEmitter object to handle
+  /// get machine code emitted.  This uses a MachineCodeEmitter object to handle
   /// actually outputting the machine code and resolving things like the address
   /// of functions.  This method should returns true if machine code emission is
   /// not supported.
   ///
-  virtual bool addPassesToEmitMachineCode(PassManager &PM,
+  virtual bool addPassesToEmitMachineCode(FunctionPassManager &PM,
                                           MachineCodeEmitter &MCE) {
     return true;
   }




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:19:02 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:19:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/LowerSwitch.cpp
Message-ID: <200308131818.h7DIIPI13794@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

LowerSwitch.cpp updated: 1.2 -> 1.3

---
Log message:

Factory methods for FunctionPasses now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/LowerSwitch.cpp
diff -u llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.2 llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.3
--- llvm/lib/Transforms/Scalar/LowerSwitch.cpp:1.2	Thu May  1 17:21:21 2003
+++ llvm/lib/Transforms/Scalar/LowerSwitch.cpp	Wed Aug 13 13:18:15 2003
@@ -30,7 +30,7 @@
 }
 
 // createLowerSwitchPass - Interface to this file...
-Pass *createLowerSwitchPass() {
+FunctionPass *createLowerSwitchPass() {
   return new LowerSwitch();
 }
 




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:19:06 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:19:06 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Interpreter/Interpreter.h
Message-ID: <200308131818.h7DII4b13724@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli/Interpreter:

Interpreter.h updated: 1.30 -> 1.31

---
Log message:

Deconstify parameter to getPointerToFunction().


---
Diffs of the changes:

Index: llvm/tools/lli/Interpreter/Interpreter.h
diff -u llvm/tools/lli/Interpreter/Interpreter.h:1.30 llvm/tools/lli/Interpreter/Interpreter.h:1.31
--- llvm/tools/lli/Interpreter/Interpreter.h:1.30	Wed May 14 09:21:30 2003
+++ llvm/tools/lli/Interpreter/Interpreter.h	Wed Aug 13 13:17:54 2003
@@ -182,7 +182,7 @@
   // 
   void SwitchToNewBasicBlock(BasicBlock *Dest, ExecutionContext &SF);
 
-  void *getPointerToFunction(const Function *F) { return (void*)F; }
+  void *getPointerToFunction(Function *F) { return (void*)F; }
 
   // getCurrentExecutablePath() - Return the directory that the lli executable
   // lives in.




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:19:11 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:19:11 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/ExecutionEngine.h
Message-ID: <200308131818.h7DII2613716@niobe.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

ExecutionEngine.h updated: 1.5 -> 1.6

---
Log message:

Deconstify parameter to getPointerToFunction().


---
Diffs of the changes:

Index: llvm/tools/lli/ExecutionEngine.h
diff -u llvm/tools/lli/ExecutionEngine.h:1.5 llvm/tools/lli/ExecutionEngine.h:1.6
--- llvm/tools/lli/ExecutionEngine.h:1.5	Fri Jul 25 13:06:53 2003
+++ llvm/tools/lli/ExecutionEngine.h	Wed Aug 13 13:17:51 2003
@@ -79,7 +79,7 @@
   // different ways.  They should each implement this to say what a function
   // pointer should look like.
   //
-  virtual void *getPointerToFunction(const Function *F) = 0;
+  virtual void *getPointerToFunction(Function *F) = 0;
 
 protected:
   void emitGlobals();




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:19:15 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:19:15 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/FloatingPoint.cpp InstSelectPattern.cpp InstSelectSimple.cpp PeepholeOptimizer.cpp
Message-ID: <200308131818.h7DIIOr13786@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

FloatingPoint.cpp updated: 1.6 -> 1.7
InstSelectPattern.cpp updated: 1.1 -> 1.2
InstSelectSimple.cpp updated: 1.120 -> 1.121
PeepholeOptimizer.cpp updated: 1.2 -> 1.3

---
Log message:

Factory methods for FunctionPasses now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/FloatingPoint.cpp
diff -u llvm/lib/Target/X86/FloatingPoint.cpp:1.6 llvm/lib/Target/X86/FloatingPoint.cpp:1.7
--- llvm/lib/Target/X86/FloatingPoint.cpp:1.6	Sun Aug  3 16:56:36 2003
+++ llvm/lib/Target/X86/FloatingPoint.cpp	Wed Aug 13 13:18:13 2003
@@ -117,7 +117,7 @@
   };
 }
 
-Pass *createX86FloatingPointStackifierPass() { return new FPS(); }
+FunctionPass *createX86FloatingPointStackifierPass() { return new FPS(); }
 
 /// runOnMachineFunction - Loop over all of the basic blocks, transforming FP
 /// register references into FP stack references.


Index: llvm/lib/Target/X86/InstSelectPattern.cpp
diff -u llvm/lib/Target/X86/InstSelectPattern.cpp:1.1 llvm/lib/Target/X86/InstSelectPattern.cpp:1.2
--- llvm/lib/Target/X86/InstSelectPattern.cpp:1.1	Mon Aug 11 09:59:22 2003
+++ llvm/lib/Target/X86/InstSelectPattern.cpp	Wed Aug 13 13:18:13 2003
@@ -112,6 +112,6 @@
 /// into a machine code representation using pattern matching and a machine
 /// description file.
 ///
-Pass *createX86PatternInstructionSelector(TargetMachine &TM) {
+FunctionPass *createX86PatternInstructionSelector(TargetMachine &TM) {
   return new ISel(TM);  
 }


Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.120 llvm/lib/Target/X86/InstSelectSimple.cpp:1.121
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.120	Mon Aug  4 19:48:47 2003
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Wed Aug 13 13:18:13 2003
@@ -2105,6 +2105,6 @@
 /// into a machine code representation is a very simple peep-hole fashion.  The
 /// generated code sucks but the implementation is nice and simple.
 ///
-Pass *createX86SimpleInstructionSelector(TargetMachine &TM) {
+FunctionPass *createX86SimpleInstructionSelector(TargetMachine &TM) {
   return new ISel(TM);
 }


Index: llvm/lib/Target/X86/PeepholeOptimizer.cpp
diff -u llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.2 llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.3
--- llvm/lib/Target/X86/PeepholeOptimizer.cpp:1.2	Thu Jan 16 12:07:13 2003
+++ llvm/lib/Target/X86/PeepholeOptimizer.cpp	Wed Aug 13 13:18:14 2003
@@ -19,7 +19,7 @@
   };
 }
 
-Pass *createX86PeepholeOptimizerPass() { return new PH(); }
+FunctionPass *createX86PeepholeOptimizerPass() { return new PH(); }
 
 bool PH::runOnMachineFunction(MachineFunction &MF) {
   bool Changed = false;




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:19:20 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:19:20 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Scalar.h
Message-ID: <200308131818.h7DIILT13758@niobe.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms:

Scalar.h updated: 1.18 -> 1.19

---
Log message:

Factory methods for FunctionPasses now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/include/llvm/Transforms/Scalar.h
diff -u llvm/include/llvm/Transforms/Scalar.h:1.18 llvm/include/llvm/Transforms/Scalar.h:1.19
--- llvm/include/llvm/Transforms/Scalar.h:1.18	Sun Jun 22 15:10:42 2003
+++ llvm/include/llvm/Transforms/Scalar.h	Wed Aug 13 13:18:11 2003
@@ -9,6 +9,7 @@
 #define LLVM_TRANSFORMS_SCALAR_H
 
 class Pass;
+class FunctionPass;
 class GetElementPtrInst;
 class PassInfo;
 class TerminatorInst;
@@ -244,7 +245,7 @@
 // This pass converts SwitchInst instructions into a sequence of chained binary
 // branch instructions.
 //
-Pass *createLowerSwitchPass();
+FunctionPass *createLowerSwitchPass();
 
 //===----------------------------------------------------------------------===//
 //




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:19:25 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:19:25 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/MachineFunction.cpp PrologEpilogInserter.cpp RegAllocLocal.cpp RegAllocSimple.cpp
Message-ID: <200308131818.h7DIINn13772@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

MachineFunction.cpp updated: 1.41 -> 1.42
PrologEpilogInserter.cpp updated: 1.11 -> 1.12
RegAllocLocal.cpp updated: 1.23 -> 1.24
RegAllocSimple.cpp updated: 1.41 -> 1.42

---
Log message:

Factory methods for FunctionPasses now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/lib/CodeGen/MachineFunction.cpp
diff -u llvm/lib/CodeGen/MachineFunction.cpp:1.41 llvm/lib/CodeGen/MachineFunction.cpp:1.42
--- llvm/lib/CodeGen/MachineFunction.cpp:1.41	Sat Jul 26 18:24:56 2003
+++ llvm/lib/CodeGen/MachineFunction.cpp	Wed Aug 13 13:18:12 2003
@@ -80,15 +80,15 @@
   };
 }
 
-Pass *createMachineCodeConstructionPass(TargetMachine &Target) {
+FunctionPass *createMachineCodeConstructionPass(TargetMachine &Target) {
   return new ConstructMachineFunction(Target);
 }
 
-Pass *createMachineCodeDestructionPass() {
+FunctionPass *createMachineCodeDestructionPass() {
   return new DestroyMachineFunction();
 }
 
-Pass *createMachineFunctionPrinterPass() {
+FunctionPass *createMachineFunctionPrinterPass() {
   return new Printer();
 }
 


Index: llvm/lib/CodeGen/PrologEpilogInserter.cpp
diff -u llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.11 llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.12
--- llvm/lib/CodeGen/PrologEpilogInserter.cpp:1.11	Mon May 26 19:05:17 2003
+++ llvm/lib/CodeGen/PrologEpilogInserter.cpp	Wed Aug 13 13:18:12 2003
@@ -62,7 +62,7 @@
 /// createPrologEpilogCodeInserter - This function returns a pass that inserts
 /// prolog and epilog code, and eliminates abstract frame references.
 ///
-Pass *createPrologEpilogCodeInserter() { return new PEI(); }
+FunctionPass *createPrologEpilogCodeInserter() { return new PEI(); }
 
 
 /// saveCallerSavedRegisters - Scan the function for modified caller saved


Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.23 llvm/lib/CodeGen/RegAllocLocal.cpp:1.24
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.23	Mon Aug  4 23:13:58 2003
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Wed Aug 13 13:18:12 2003
@@ -643,6 +643,6 @@
   return true;
 }
 
-Pass *createLocalRegisterAllocator() {
+FunctionPass *createLocalRegisterAllocator() {
   return new RA();
 }


Index: llvm/lib/CodeGen/RegAllocSimple.cpp
diff -u llvm/lib/CodeGen/RegAllocSimple.cpp:1.41 llvm/lib/CodeGen/RegAllocSimple.cpp:1.42
--- llvm/lib/CodeGen/RegAllocSimple.cpp:1.41	Sun Aug  3 16:47:31 2003
+++ llvm/lib/CodeGen/RegAllocSimple.cpp	Wed Aug 13 13:18:12 2003
@@ -224,6 +224,6 @@
   return true;
 }
 
-Pass *createSimpleRegisterAllocator() {
+FunctionPass *createSimpleRegisterAllocator() {
   return new RegAllocSimple();
 }




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 13:19:29 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 13:19:29 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineFunction.h Passes.h
Message-ID: <200308131818.h7DIIKF13750@niobe.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

MachineFunction.h updated: 1.26 -> 1.27
Passes.h updated: 1.1 -> 1.2

---
Log message:

Factory methods for FunctionPasses now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/include/llvm/CodeGen/MachineFunction.h
diff -u llvm/include/llvm/CodeGen/MachineFunction.h:1.26 llvm/include/llvm/CodeGen/MachineFunction.h:1.27
--- llvm/include/llvm/CodeGen/MachineFunction.h:1.26	Tue Jan 14 15:29:39 2003
+++ llvm/include/llvm/CodeGen/MachineFunction.h	Wed Aug 13 13:18:10 2003
@@ -17,15 +17,15 @@
 
 class Function;
 class TargetMachine;
-class Pass;
+class FunctionPass;
 class SSARegMap;
 class MachineFunctionInfo;
 class MachineFrameInfo;
 class MachineConstantPool;
 
-Pass *createMachineCodeConstructionPass(TargetMachine &TM);
-Pass *createMachineCodeDestructionPass();
-Pass *createMachineFunctionPrinterPass();
+FunctionPass *createMachineCodeConstructionPass(TargetMachine &TM);
+FunctionPass *createMachineCodeDestructionPass();
+FunctionPass *createMachineFunctionPrinterPass();
 
 class MachineFunction : private Annotation {
   const Function *Fn;


Index: llvm/include/llvm/CodeGen/Passes.h
diff -u llvm/include/llvm/CodeGen/Passes.h:1.1 llvm/include/llvm/CodeGen/Passes.h:1.2
--- llvm/include/llvm/CodeGen/Passes.h:1.1	Sun Jan 12 19:01:31 2003
+++ llvm/include/llvm/CodeGen/Passes.h	Wed Aug 13 13:18:10 2003
@@ -8,7 +8,7 @@
 #ifndef LLVM_CODEGEN_PASSES_H
 #define LLVM_CODEGEN_PASSES_H
 
-class Pass;
+class FunctionPass;
 class PassInfo;
 
 // PHIElimination pass - This pass eliminates machine instruction PHI nodes by
@@ -22,17 +22,17 @@
 /// from SSA form to use explicit registers by spilling every register.  Wow,
 /// great policy huh?
 ///
-Pass *createSimpleRegisterAllocator();
+FunctionPass *createSimpleRegisterAllocator();
 
 /// LocalRegisterAllocation Pass - This pass register allocates the input code a
 /// basic block at a time, yielding code better than the simple register
 /// allocator, but not as good as a global allocator.
 /// 
-Pass *createLocalRegisterAllocator();
+FunctionPass *createLocalRegisterAllocator();
 
 /// PrologEpilogCodeInserter Pass - This pass inserts prolog and epilog code,
 /// and eliminates abstract frame references.
 ///
-Pass *createPrologEpilogCodeInserter();
+FunctionPass *createPrologEpilogCodeInserter();
 
 #endif




From lattner at cs.uiuc.edu  Wed Aug 13 14:02:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 14:02:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/add.ll
Message-ID: <200308131901.OAA00822@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

add.ll updated: 1.12 -> 1.13

---
Log message:

Add some tests for difficult reassociation cases


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/add.ll
diff -u llvm/test/Regression/Transforms/InstCombine/add.ll:1.12 llvm/test/Regression/Transforms/InstCombine/add.ll:1.13
--- llvm/test/Regression/Transforms/InstCombine/add.ll:1.12	Wed Aug 13 00:27:57 2003
+++ llvm/test/Regression/Transforms/InstCombine/add.ll	Wed Aug 13 14:01:09 2003
@@ -1,9 +1,6 @@
 ; This test makes sure that add instructions are properly eliminated.
-;
-; This also tests that a subtract with a constant is properly converted
-; to a add w/negative constant
 
-; RUN: as < %s | opt -instcombine -die | dis | not grep add
+; RUN: as < %s | opt -instcombine -die | dis | grep -v OK | not grep add
 
 implementation
 
@@ -72,3 +69,27 @@
         %c = setne ubyte %B, 0    ; === A != 1
         ret bool %c
 }
+
+int %test12(int %A, int %B) {
+	%C_OK = add int %B, %A       ; Should be transformed into shl A, 1
+	br label %X
+X:
+	%D = add int %C_OK, %A 
+	ret int %D
+}
+
+int %test13(int %A, int %B, int %C) {
+	%D_OK = add int %A, %B
+	%E_OK = add int %D_OK, %C
+	%F = add int %E_OK, %A        ;; shl A, 1
+	ret int %F
+}
+
+uint %test14(uint %offset, uint %difference) {
+        %tmp.2 = and uint %difference, 3
+        %tmp.3_OK = add uint %tmp.2, %offset
+        %tmp.5.mask = and uint %difference, 4294967292
+        %tmp.8 = add uint %tmp.3_OK, %tmp.5.mask ; == add %offset, %difference
+        ret uint %tmp.8
+}
+




From lattner at cs.uiuc.edu  Wed Aug 13 14:02:08 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 14:02:08 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200308131901.OAA00839@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.115 -> 1.116

---
Log message:

Generalize some of the add tests to allow for reassociation to take place


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.115 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.116
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.115	Wed Aug 13 00:38:46 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Wed Aug 13 14:01:45 2003
@@ -267,18 +267,140 @@
   return Count;
 }
 
+
+/// AssociativeOpt - Perform an optimization on an associative operator.  This
+/// function is designed to check a chain of associative operators for a
+/// potential to apply a certain optimization.  Since the optimization may be
+/// applicable if the expression was reassociated, this checks the chain, then
+/// reassociates the expression as necessary to expose the optimization
+/// opportunity.  This makes use of a special Functor, which must define
+/// 'shouldApply' and 'apply' methods.
+///
+template<typename Functor>
+Instruction *AssociativeOpt(BinaryOperator &Root, const Functor &F) {
+  unsigned Opcode = Root.getOpcode();
+  Value *LHS = Root.getOperand(0);
+
+  // Quick check, see if the immediate LHS matches...
+  if (F.shouldApply(LHS))
+    return F.apply(Root);
+
+  // Otherwise, if the LHS is not of the same opcode as the root, return.
+  Instruction *LHSI = dyn_cast<Instruction>(LHS);
+  while (LHSI && LHSI->getOpcode() == Opcode && LHSI->use_size() == 1) {
+    // Should we apply this transform to the RHS?
+    bool ShouldApply = F.shouldApply(LHSI->getOperand(1));
+
+    // If not to the RHS, check to see if we should apply to the LHS...
+    if (!ShouldApply && F.shouldApply(LHSI->getOperand(0))) {
+      cast<BinaryOperator>(LHSI)->swapOperands();   // Make the LHS the RHS
+      ShouldApply = true;
+    }
+
+    // If the functor wants to apply the optimization to the RHS of LHSI,
+    // reassociate the expression from ((? op A) op B) to (? op (A op B))
+    if (ShouldApply) {
+      BasicBlock *BB = Root.getParent();
+      // All of the instructions have a single use and have no side-effects,
+      // because of this, we can pull them all into the current basic block.
+      if (LHSI->getParent() != BB) {
+        // Move all of the instructions from root to LHSI into the current
+        // block.
+        Instruction *TmpLHSI = cast<Instruction>(Root.getOperand(0));
+        Instruction *LastUse = &Root;
+        while (TmpLHSI->getParent() == BB) {
+          LastUse = TmpLHSI;
+          TmpLHSI = cast<Instruction>(TmpLHSI->getOperand(0));
+        }
+        
+        // Loop over all of the instructions in other blocks, moving them into
+        // the current one.
+        Value *TmpLHS = TmpLHSI;
+        do {
+          TmpLHSI = cast<Instruction>(TmpLHS);
+          // Remove from current block...
+          TmpLHSI->getParent()->getInstList().remove(TmpLHSI);
+          // Insert before the last instruction...
+          BB->getInstList().insert(LastUse, TmpLHSI);
+          TmpLHS = TmpLHSI->getOperand(0);
+        } while (TmpLHSI != LHSI);
+      }
+      
+      // Now all of the instructions are in the current basic block, go ahead
+      // and perform the reassociation.
+      Instruction *TmpLHSI = cast<Instruction>(Root.getOperand(0));
+
+      // First move the selected RHS to the LHS of the root...
+      Root.setOperand(0, LHSI->getOperand(1));
+
+      // Make what used to be the LHS of the root be the user of the root...
+      Value *ExtraOperand = TmpLHSI->getOperand(1);
+      Root.replaceAllUsesWith(TmpLHSI);          // Users now use TmpLHSI
+      TmpLHSI->setOperand(1, &Root);             // TmpLHSI now uses the root
+      BB->getInstList().remove(&Root);           // Remove root from the BB
+      BB->getInstList().insert(TmpLHSI, &Root);  // Insert root before TmpLHSI
+
+      // Now propagate the ExtraOperand down the chain of instructions until we
+      // get to LHSI.
+      while (TmpLHSI != LHSI) {
+        Instruction *NextLHSI = cast<Instruction>(TmpLHSI->getOperand(0));
+        Value *NextOp = NextLHSI->getOperand(1);
+        NextLHSI->setOperand(1, ExtraOperand);
+        TmpLHSI = NextLHSI;
+        ExtraOperand = NextOp;
+      }
+      
+      // Now that the instructions are reassociated, have the functor perform
+      // the transformation...
+      return F.apply(Root);
+    }
+    
+    LHSI = dyn_cast<Instruction>(LHSI->getOperand(0));
+  }
+  return 0;
+}
+
+
+// AddRHS - Implements: X + X --> X << 1
+struct AddRHS {
+  Value *RHS;
+  AddRHS(Value *rhs) : RHS(rhs) {}
+  bool shouldApply(Value *LHS) const { return LHS == RHS; }
+  Instruction *apply(BinaryOperator &Add) const {
+    return new ShiftInst(Instruction::Shl, Add.getOperand(0),
+                         ConstantInt::get(Type::UByteTy, 1));
+  }
+};
+
+// AddMaskingAnd - Implements (A & C1)+(B & C2) --> (A & C1)|(B & C2)
+//                 iff C1&C2 == 0
+struct AddMaskingAnd {
+  Constant *C2;
+  AddMaskingAnd(Constant *c) : C2(c) {}
+  bool shouldApply(Value *LHS) const {
+    if (Constant *C1 = dyn_castMaskingAnd(LHS))
+      return ConstantExpr::get(Instruction::And, C1, C2)->isNullValue();
+    return false;
+  }
+  Instruction *apply(BinaryOperator &Add) const {
+    return BinaryOperator::create(Instruction::Or, Add.getOperand(0),
+                                  Add.getOperand(1));
+  }
+};
+
+
+
 Instruction *InstCombiner::visitAdd(BinaryOperator &I) {
   bool Changed = SimplifyCommutative(I);
   Value *LHS = I.getOperand(0), *RHS = I.getOperand(1);
 
-  // Eliminate 'add int %X, 0'
+  // X + 0 --> X
   if (RHS == Constant::getNullValue(I.getType()))
     return ReplaceInstUsesWith(I, LHS);
 
-  // Convert 'add X, X' to 'shl X, 1'
-  if (LHS == RHS && I.getType()->isInteger())
-    return new ShiftInst(Instruction::Shl, LHS,
-                         ConstantInt::get(Type::UByteTy, 1));
+  // X + X --> X << 1
+  if (I.getType()->isInteger())
+    if (Instruction *Result = AssociativeOpt(I, AddRHS(RHS))) return Result;
 
   // -A + B  -->  B - A
   if (Value *V = dyn_castNegVal(LHS))
@@ -307,11 +429,9 @@
     return BinaryOperator::create(Instruction::Mul, LHS, CP1);
   }
 
-  // (A & C1)+(B & C2) -> (A & C1)|(B & C2) iff C1&C2 == 0
-  if (Constant *C1 = dyn_castMaskingAnd(LHS))
-    if (Constant *C2 = dyn_castMaskingAnd(RHS))
-      if (ConstantExpr::get(Instruction::And, C1, C2)->isNullValue())
-        return BinaryOperator::create(Instruction::Or, LHS, RHS);
+  // (A & C1)+(B & C2) --> (A & C1)|(B & C2) iff C1&C2 == 0
+  if (Constant *C2 = dyn_castMaskingAnd(RHS))
+    if (Instruction *R = AssociativeOpt(I, AddMaskingAnd(C2))) return R;
 
   return Changed ? &I : 0;
 }




From gaeke at niobe.cs.uiuc.edu  Wed Aug 13 14:03:02 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Wed Aug 13 14:03:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/README.txt
Message-ID: <200308131902.h7DJ2JH13936@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

README.txt updated: 1.9 -> 1.10

---
Log message:

X86 static backend: smacked
Function at a time: smacked

Who you gonna call!!!  :-)


---
Diffs of the changes:

Index: llvm/lib/Target/X86/README.txt
diff -u llvm/lib/Target/X86/README.txt:1.9 llvm/lib/Target/X86/README.txt:1.10
--- llvm/lib/Target/X86/README.txt:1.9	Tue Aug 12 19:30:48 2003
+++ llvm/lib/Target/X86/README.txt	Wed Aug 13 14:02:09 2003
@@ -164,8 +164,7 @@
 After this project:
 -------------------
 1. Implement lots of nifty runtime optimizations
-2. Implement a static compiler backend for x86 (might come almost for free...)
-3. Implement new targets: IA64? X86-64? M68k? MMIX?  Who knows...
+2. Implement new targets: IA64? X86-64? M68k? MMIX?  Who knows...
 
 Infrastructure Improvements:
 ----------------------------
@@ -174,10 +173,7 @@
    bytecode without having to read the whole program.  Bytecode reader should be
    extended to allow on-demand loading of functions.
 
-2. PassManager needs to be able to run just a single function through a pipeline
-   of FunctionPass's.
-
-3. X86/Printer.cpp and Sparc/EmitAssembly.cpp both have copies of what is
+2. X86/Printer.cpp and Sparc/EmitAssembly.cpp both have copies of what is
    roughly the same code, used to output constants in a form the assembler
    can understand. These functions should be shared at some point. They
    should be rewritten to pass around iostreams instead of strings. The




From lattner at cs.uiuc.edu  Wed Aug 13 15:14:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 15:14:02 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/xor.ll
Message-ID: <200308132013.PAA13770@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

xor.ll updated: 1.4 -> 1.5

---
Log message:

Add some more tests for: (A <setcc1> B) logicalop (A <setcc2> B)


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/xor.ll
diff -u llvm/test/Regression/Transforms/InstCombine/xor.ll:1.4 llvm/test/Regression/Transforms/InstCombine/xor.ll:1.5
--- llvm/test/Regression/Transforms/InstCombine/xor.ll:1.4	Wed Aug 13 00:27:57 2003
+++ llvm/test/Regression/Transforms/InstCombine/xor.ll	Wed Aug 13 15:13:15 2003
@@ -84,3 +84,17 @@
 	%c = setne ubyte %B, 0
 	ret bool %c
 }
+
+bool %test13(ubyte %A, ubyte %B) {
+	%C = setlt ubyte %A, %B
+	%D = setgt ubyte %A, %B
+	%E = xor bool %C, %D        ; E = setne %A, %B
+	ret bool %E
+}
+
+bool %test14(ubyte %A, ubyte %B) {
+	%C = seteq ubyte %A, %B
+	%D = setne ubyte %B, %A
+	%E = xor bool %C, %D        ; E = true
+	ret bool %E
+}




From lattner at cs.uiuc.edu  Wed Aug 13 15:17:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 15:17:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200308132016.PAA15434@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.116 -> 1.117

---
Log message:

Implement instcombine optimizations:
   (A <setcc1> B) logicalop (A <setcc2> B)  -> (A <setcc3> B) or true or false

Where setcc[123] is one of the 6 setcc instructions, and logicalop is one of: And, Or, Xor



---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.116 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.117
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.116	Wed Aug 13 14:01:45 2003
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Wed Aug 13 15:16:26 2003
@@ -112,6 +112,7 @@
       WorkList.push_back(New);              // Add to worklist
     }
 
+  public:
     // ReplaceInstUsesWith - This method is to be used when an instruction is
     // found to be dead, replacable with another preexisting expression.  Here
     // we add all uses of I to the worklist, replace all uses of I with the new
@@ -123,7 +124,7 @@
       I.replaceAllUsesWith(V);
       return &I;
     }
-
+  private:
     /// InsertOperandCastBefore - This inserts a cast of V to DestTy before the
     /// InsertBefore instruction.  This is specialized a bit to avoid inserting
     /// casts that are known to not do anything...
@@ -638,6 +639,86 @@
   return CS->getValue() == Val+1;
 }
 
+/// getSetCondCode - Encode a setcc opcode into a three bit mask.  These bits
+/// are carefully arranged to allow folding of expressions such as:
+///
+///      (A < B) | (A > B) --> (A != B)
+///
+/// Bit value '4' represents that the comparison is true if A > B, bit value '2'
+/// represents that the comparison is true if A == B, and bit value '1' is true
+/// if A < B.
+///
+static unsigned getSetCondCode(const SetCondInst *SCI) {
+  switch (SCI->getOpcode()) {
+    // False -> 0
+  case Instruction::SetGT: return 1;
+  case Instruction::SetEQ: return 2;
+  case Instruction::SetGE: return 3;
+  case Instruction::SetLT: return 4;
+  case Instruction::SetNE: return 5;
+  case Instruction::SetLE: return 6;
+    // True -> 7
+  default:
+    assert(0 && "Invalid SetCC opcode!");
+    return 0;
+  }
+}
+
+/// getSetCCValue - This is the complement of getSetCondCode, which turns an
+/// opcode and two operands into either a constant true or false, or a brand new
+/// SetCC instruction.
+static Value *getSetCCValue(unsigned Opcode, Value *LHS, Value *RHS) {
+  switch (Opcode) {
+  case 0: return ConstantBool::False;
+  case 1: return new SetCondInst(Instruction::SetGT, LHS, RHS);
+  case 2: return new SetCondInst(Instruction::SetEQ, LHS, RHS);
+  case 3: return new SetCondInst(Instruction::SetGE, LHS, RHS);
+  case 4: return new SetCondInst(Instruction::SetLT, LHS, RHS);
+  case 5: return new SetCondInst(Instruction::SetNE, LHS, RHS);
+  case 6: return new SetCondInst(Instruction::SetLE, LHS, RHS);
+  case 7: return ConstantBool::True;
+  default: assert(0 && "Illegal SetCCCode!"); return 0;
+  }
+}
+
+// FoldSetCCLogical - Implements (setcc1 A, B) & (setcc2 A, B) --> (setcc3 A, B)
+struct FoldSetCCLogical {
+  InstCombiner &IC;
+  Value *LHS, *RHS;
+  FoldSetCCLogical(InstCombiner &ic, SetCondInst *SCI)
+    : IC(ic), LHS(SCI->getOperand(0)), RHS(SCI->getOperand(1)) {}
+  bool shouldApply(Value *V) const {
+    if (SetCondInst *SCI = dyn_cast<SetCondInst>(V))
+      return (SCI->getOperand(0) == LHS && SCI->getOperand(1) == RHS ||
+              SCI->getOperand(0) == RHS && SCI->getOperand(1) == LHS);
+    return false;
+  }
+  Instruction *apply(BinaryOperator &Log) const {
+    SetCondInst *SCI = cast<SetCondInst>(Log.getOperand(0));
+    if (SCI->getOperand(0) != LHS) {
+      assert(SCI->getOperand(1) == LHS);
+      SCI->swapOperands();  // Swap the LHS and RHS of the SetCC
+    }
+
+    unsigned LHSCode = getSetCondCode(SCI);
+    unsigned RHSCode = getSetCondCode(cast<SetCondInst>(Log.getOperand(1)));
+    unsigned Code;
+    switch (Log.getOpcode()) {
+    case Instruction::And: Code = LHSCode & RHSCode; break;
+    case Instruction::Or:  Code = LHSCode | RHSCode; break;
+    case Instruction::Xor: Code = LHSCode ^ RHSCode; break;
+    default: assert(0 && "Illegal logical opcode!");
+    }
+
+    Value *RV = getSetCCValue(Code, LHS, RHS);
+    if (Instruction *I = dyn_cast<Instruction>(RV))
+      return I;
+    // Otherwise, it's a constant boolean value...
+    return IC.ReplaceInstUsesWith(Log, RV);
+  }
+};
+
+
 
 Instruction *InstCombiner::visitAnd(BinaryOperator &I) {
   bool Changed = SimplifyCommutative(I);
@@ -704,6 +785,11 @@
   if (Op0NotVal == Op1 || Op1NotVal == Op0)  // A & ~A  == ~A & A == 0
     return ReplaceInstUsesWith(I, Constant::getNullValue(I.getType()));
 
+  // (setcc1 A, B) & (setcc2 A, B) --> (setcc3 A, B)
+  if (SetCondInst *RHS = dyn_cast<SetCondInst>(I.getOperand(1)))
+    if (Instruction *R = AssociativeOpt(I, FoldSetCCLogical(*this, RHS)))
+      return R;
+
   return Changed ? &I : 0;
 }
 
@@ -776,6 +862,11 @@
     return BinaryOperator::createNot(And);
   }
 
+  // (setcc1 A, B) | (setcc2 A, B) --> (setcc3 A, B)
+  if (SetCondInst *RHS = dyn_cast<SetCondInst>(I.getOperand(1)))
+    if (Instruction *R = AssociativeOpt(I, FoldSetCCLogical(*this, RHS)))
+      return R;
+
   return Changed ? &I : 0;
 }
 
@@ -852,6 +943,11 @@
     if (Constant *C2 = dyn_castMaskingAnd(Op1))
       if (ConstantExpr::get(Instruction::And, C1, C2)->isNullValue())
         return BinaryOperator::create(Instruction::Or, Op0, Op1);
+
+  // (setcc1 A, B) ^ (setcc2 A, B) --> (setcc3 A, B)
+  if (SetCondInst *RHS = dyn_cast<SetCondInst>(I.getOperand(1)))
+    if (Instruction *R = AssociativeOpt(I, FoldSetCCLogical(*this, RHS)))
+      return R;
 
   return Changed ? &I : 0;
 }




From lattner at cs.uiuc.edu  Wed Aug 13 15:18:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 15:18:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/and.ll
Message-ID: <200308132017.PAA16535@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/InstCombine:

and.ll updated: 1.15 -> 1.16

---
Log message:

I must have missed these when eliminating the cast to bool cannonicalizations


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/InstCombine/and.ll
diff -u llvm/test/Regression/Transforms/InstCombine/and.ll:1.15 llvm/test/Regression/Transforms/InstCombine/and.ll:1.16
--- llvm/test/Regression/Transforms/InstCombine/and.ll:1.15	Wed Aug 13 00:27:57 2003
+++ llvm/test/Regression/Transforms/InstCombine/and.ll	Wed Aug 13 15:17:41 2003
@@ -49,13 +49,13 @@
 
 bool %test9(int %A) {
 	%B = and int %A, -2147483648   ; Test of sign bit, convert to setle %A, 0 
-	%C = cast int %B to bool
+	%C = setne int %B, 0
 	ret bool %C
 }
 
 bool %test9(uint %A) {
 	%B = and uint %A, 2147483648   ; Test of sign bit, convert to setle %A, 0 
-	%C = cast uint %B to bool
+	%C = setne uint %B, 0
 	ret bool %C
 }
 




From lattner at cs.uiuc.edu  Wed Aug 13 15:43:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 15:43:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat-08-main/object.c
Message-ID: <200308132042.PAA18506@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat-08-main:

object.c updated: 1.2 -> 1.3

---
Log message:

Fix a bug where the test would read uninitialized memory, causing some of the
JIT's to crash.


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat-08-main/object.c
diff -u llvm/test/Programs/MultiSource/McCat-08-main/object.c:1.2 llvm/test/Programs/MultiSource/McCat-08-main/object.c:1.3
--- llvm/test/Programs/MultiSource/McCat-08-main/object.c:1.2	Mon May 12 15:06:55 2003
+++ llvm/test/Programs/MultiSource/McCat-08-main/object.c	Wed Aug 13 15:42:47 2003
@@ -23,7 +23,7 @@
 Oalloc(char name[57])
 {
   ObjPtr o=NULL;
-  o = (ObjPtr) malloc(sizeof(object));
+  o = (ObjPtr) calloc(sizeof(object), 1);
   strcpy(o->Name,name);
   o->Color.R = 1;
   o->Color.G = 1;




From lattner at cs.uiuc.edu  Wed Aug 13 16:33:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 16:33:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Support/Statistic.cpp
Message-ID: <200308132132.QAA18632@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

Statistic.cpp updated: 1.9 -> 1.10

---
Log message:

This file uses stable_sort


---
Diffs of the changes:

Index: llvm/lib/Support/Statistic.cpp
diff -u llvm/lib/Support/Statistic.cpp:1.9 llvm/lib/Support/Statistic.cpp:1.10
--- llvm/lib/Support/Statistic.cpp:1.9	Fri Aug  1 17:15:41 2003
+++ llvm/lib/Support/Statistic.cpp	Wed Aug 13 16:32:37 2003
@@ -18,6 +18,7 @@
 #include "Support/CommandLine.h"
 #include <sstream>
 #include <iostream>
+#include <algorithm>
 
 // GetLibSupportInfoOutputFile - Return a file stream to print our output on...
 std::ostream *GetLibSupportInfoOutputFile();




From lattner at cs.uiuc.edu  Wed Aug 13 17:16:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Wed Aug 13 17:16:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/IPO/FunctionResolution.cpp
Message-ID: <200308132215.RAA18884@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/IPO:

FunctionResolution.cpp updated: 1.33 -> 1.34

---
Log message:

Fix FIXME by removing FIXME


---
Diffs of the changes:

Index: llvm/lib/Transforms/IPO/FunctionResolution.cpp
diff -u llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.33 llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.34
--- llvm/lib/Transforms/IPO/FunctionResolution.cpp:1.33	Wed Jul 23 17:03:18 2003
+++ llvm/lib/Transforms/IPO/FunctionResolution.cpp	Wed Aug 13 17:15:04 2003
@@ -18,7 +18,7 @@
 #include "llvm/Pass.h"
 #include "llvm/iOther.h"
 #include "llvm/Constants.h"
-#include "llvm/Assembly/Writer.h"  // FIXME: remove when varargs implemented
+#include "llvm/Assembly/Writer.h"
 #include "Support/Statistic.h"
 #include <algorithm>
 




From brukman at cs.uiuc.edu  Wed Aug 13 17:28:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Aug 13 17:28:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/CodeGenWrappers.h
Message-ID: <200308132227.RAA20125@zion.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

CodeGenWrappers.h updated: 1.4 -> 1.5

---
Log message:

Using std::string requires `#include <string>', says gcc-2.95.3.


---
Diffs of the changes:

Index: llvm/utils/TableGen/CodeGenWrappers.h
diff -u llvm/utils/TableGen/CodeGenWrappers.h:1.4 llvm/utils/TableGen/CodeGenWrappers.h:1.5
--- llvm/utils/TableGen/CodeGenWrappers.h:1.4	Sun Aug 10 14:50:32 2003
+++ llvm/utils/TableGen/CodeGenWrappers.h	Wed Aug 13 17:27:15 2003
@@ -12,6 +12,7 @@
 
 #include "llvm/CodeGen/ValueTypes.h"
 #include <iosfwd>
+#include <string>
 #include <vector>
 class Record;
 class RecordKeeper;




From lattner at cs.uiuc.edu  Thu Aug 14 00:21:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 00:21:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Pass.cpp PassManagerT.h
Message-ID: <200308140520.AAA23672@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Pass.cpp updated: 1.44 -> 1.45
PassManagerT.h updated: 1.39 -> 1.40

---
Log message:

Dramatically simplify how -time-passes works.
This also enables -time-passes for FunctionPassManagers, which allows it to
be used for the JIT


---
Diffs of the changes:

Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.44 llvm/lib/VMCore/Pass.cpp:1.45
--- llvm/lib/VMCore/Pass.cpp:1.44	Tue Aug 12 12:22:37 2003
+++ llvm/lib/VMCore/Pass.cpp	Thu Aug 14 00:20:28 2003
@@ -90,11 +90,17 @@
 EnableTiming("time-passes",
             cl::desc("Time each pass, printing elapsed time for each on exit"));
 
-// Create method.  If Timing is enabled, this creates and returns a new timing
-// object, otherwise it returns null.
-//
-TimingInfo *TimingInfo::create() {
-  return EnableTiming ? new TimingInfo() : 0;
+// createTheTimeInfo - This method either initializes the TheTimeInfo pointer to
+// a non null value (if the -time-passes option is enabled) or it leaves it
+// null.  It may be called multiple times.
+void TimingInfo::createTheTimeInfo() {
+  if (!EnableTiming || TheTimeInfo) return;
+
+  // Constructed the first time this is called, iff -time-passes is enabled.
+  // This guarantees that the object will be constructed before static globals,
+  // thus it will be destroyed before them.
+  static TimingInfo TTI;
+  TheTimeInfo = &TTI;
 }
 
 void PMDebug::PrintArgumentInformation(const Pass *P) {


Index: llvm/lib/VMCore/PassManagerT.h
diff -u llvm/lib/VMCore/PassManagerT.h:1.39 llvm/lib/VMCore/PassManagerT.h:1.40
--- llvm/lib/VMCore/PassManagerT.h:1.39	Mon Jun 23 14:16:20 2003
+++ llvm/lib/VMCore/PassManagerT.h	Thu Aug 14 00:20:28 2003
@@ -84,11 +84,6 @@
   // Private ctor, must use 'create' member
   TimingInfo() : TG("... Pass execution timing report ...") {}
 public:
-  // Create method.  If Timing is enabled, this creates and returns a new timing
-  // object, otherwise it returns null.
-  //
-  static TimingInfo *create();
-
   // TimingDtor - Print out information about timing information
   ~TimingInfo() {
     // Delete all of the timers...
@@ -96,6 +91,11 @@
     // TimerGroup is deleted next, printing the report.
   }
 
+  // createTheTimeInfo - This method either initializes the TheTimeInfo pointer
+  // to a non null value (if the -time-passes option is enabled) or it leaves it
+  // null.  It may be called multiple times.
+  static void createTheTimeInfo();
+
   void passStarted(Pass *P) {
     if (dynamic_cast<AnalysisResolver*>(P)) return;
     std::map<Pass*, Timer>::iterator I = TimingData.find(P);
@@ -111,6 +111,8 @@
   }
 };
 
+static TimingInfo *TheTimeInfo;
+
 //===----------------------------------------------------------------------===//
 // Declare the PassManagerTraits which will be specialized...
 //
@@ -176,6 +178,8 @@
     closeBatcher();
     CurrentAnalyses.clear();
 
+    TimingInfo::createTheTimeInfo();
+
     // Add any immutable passes to the CurrentAnalyses set...
     for (unsigned i = 0, e = ImmutablePasses.size(); i != e; ++i) {
       ImmutablePass *IPass = ImmutablePasses[i];
@@ -235,9 +239,9 @@
       }
 
       // Run the sub pass!
-      startPass(P);
+      if (TheTimeInfo) TheTimeInfo->passStarted(P);
       bool Changed = runPass(P, M);
-      endPass(P);
+      if (TheTimeInfo) TheTimeInfo->passEnded(P);
       MadeChanges |= Changed;
 
       // Check for memory leaks by the pass...
@@ -305,6 +309,7 @@
         }
       }
     }
+
     return MadeChanges;
   }
 
@@ -375,20 +380,6 @@
     return 0;
   }
 
-  // {start/end}Pass - Called when a pass is started, it just propagates
-  // information up to the top level PassManagerT object to tell it that a pass
-  // has started or ended.  This is used to gather timing information about
-  // passes.
-  //
-  void startPass(Pass *P) {
-    if (Parent) Parent->startPass(P);
-    else PassStarted(P);
-  }
-  void endPass(Pass *P) {
-    if (Parent) Parent->endPass(P);
-    else PassEnded(P);
-  }
-
   // markPassUsed - Inform higher level pass managers (and ourselves)
   // that these analyses are being used by this pass.  This is used to
   // make sure that analyses are not free'd before we have to use
@@ -619,10 +610,6 @@
     return P->runOnBasicBlock(*M);
   }
 
-  // Dummy implementation of PassStarted/PassEnded
-  static void PassStarted(Pass *P) {}
-  static void PassEnded(Pass *P) {}
-
   // getPMName() - Return the name of the unit the PassManager operates on for
   // debugging.
   const char *getPMName() const { return "BasicBlock"; }
@@ -669,10 +656,6 @@
     return P->runOnFunction(*F);
   }
 
-  // Dummy implementation of PassStarted/PassEnded
-  static void PassStarted(Pass *P) {}
-  static void PassEnded(Pass *P) {}
-
   // getPMName() - Return the name of the unit the PassManager operates on for
   // debugging.
   const char *getPMName() const { return "Function"; }
@@ -716,37 +699,10 @@
   const char *getPMName() const { return "Module"; }
   virtual const char *getPassName() const { return "Module Pass Manager"; }
 
-  // TimingInformation - This data member maintains timing information for each
-  // of the passes that is executed.
-  //
-  TimingInfo *TimeInfo;
-
-  // PassStarted/Ended - This callback is notified any time a pass is started
-  // or stops.  This is used to collect timing information about the different
-  // passes being executed.
-  //
-  void PassStarted(Pass *P) {
-    if (TimeInfo) TimeInfo->passStarted(P);
-  }
-  void PassEnded(Pass *P) {
-    if (TimeInfo) TimeInfo->passEnded(P);
-  }
-
   // run - Implement the PassManager interface...
   bool run(Module &M) {
-    TimeInfo = TimingInfo::create();
-    bool Result = ((PassManagerT<Module>*)this)->runOnUnit(&M);
-    if (TimeInfo) {
-      delete TimeInfo;
-      TimeInfo = 0;
-    }
-    return Result;
+    return ((PassManagerT<Module>*)this)->runOnUnit(&M);
   }
-
-  // PassManagerTraits constructor - Create a timing info object if the user
-  // specified timing info should be collected on the command line.
-  //
-  PassManagerTraits() : TimeInfo(0) {}
 };
 
 




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:05:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:05:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcInternals.h
Message-ID: <200308140604.h7E64dE31778@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcInternals.h updated: 1.97 -> 1.98

---
Log message:

Unbreak SPARC backend: addPassesToJITCompile and
 addPassesToEmitMachineCode now both take a FunctionPassManager.
Factory methods for function passes now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcInternals.h
diff -u llvm/lib/Target/Sparc/SparcInternals.h:1.97 llvm/lib/Target/Sparc/SparcInternals.h:1.98
--- llvm/lib/Target/Sparc/SparcInternals.h:1.97	Tue Aug 12 21:38:16 2003
+++ llvm/lib/Target/Sparc/SparcInternals.h	Thu Aug 14 01:04:29 2003
@@ -683,12 +683,12 @@
   virtual const TargetOptInfo    &getOptInfo()   const { return optInfo; }
 
   virtual bool addPassesToEmitAssembly(PassManager &PM, std::ostream &Out);
-  virtual bool addPassesToJITCompile(PassManager &PM);
-  virtual bool addPassesToEmitMachineCode(PassManager &PM,
+  virtual bool addPassesToJITCompile(FunctionPassManager &PM);
+  virtual bool addPassesToEmitMachineCode(FunctionPassManager &PM,
                                           MachineCodeEmitter &MCE);
 
   // getPrologEpilogInsertionPass - Inserts prolog/epilog code.
-  Pass* getPrologEpilogInsertionPass();
+  FunctionPass* getPrologEpilogInsertionPass();
 
   // getFunctionAsmPrinterPass - Writes out machine code for a single function
   Pass* getFunctionAsmPrinterPass(std::ostream &Out);




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:05:07 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:05:07 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp
Message-ID: <200308140604.h7E64w531795@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/InstrSelection:

InstrSelection.cpp updated: 1.59 -> 1.60

---
Log message:

Factory methods for function passes now return type FunctionPass *.
Get rid of RegisterLLC, which can't handle FunctionPasses anyway.


---
Diffs of the changes:

Index: llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp
diff -u llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp:1.59 llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp:1.60
--- llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp:1.59	Sat Jul 26 18:29:40 2003
+++ llvm/lib/CodeGen/InstrSelection/InstrSelection.cpp	Thu Aug 14 01:04:48 2003
@@ -71,13 +71,10 @@
     }
     
     bool runOnFunction(Function &F);
+    virtual const char *getPassName() const { return "Instruction Selection"; }
   };
 }
 
-// Register the pass...
-static RegisterLLC<InstructionSelection>
-X("instselect", "Instruction Selection", createInstructionSelectionPass);
-
 TmpInstruction::TmpInstruction(MachineCodeForInstruction& mcfi,
                                Value *s1, Value *s2, const std::string &name)
   : Instruction(s1->getType(), Instruction::UserOp1, name)
@@ -384,6 +381,6 @@
 // createInstructionSelectionPass - Public entrypoint for instruction selection
 // and this file as a whole...
 //
-Pass *createInstructionSelectionPass(TargetMachine &T) {
+FunctionPass *createInstructionSelectionPass(TargetMachine &T) {
   return new InstructionSelection(T);
 }




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:05:12 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:05:12 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp
Message-ID: <200308140604.h7E64xj31804@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/PostOpts:

PeepholeOpts.cpp updated: 1.7 -> 1.8

---
Log message:

Factory methods for function passes now return type FunctionPass *.
Get rid of RegisterLLC, which can't handle FunctionPasses anyway.


---
Diffs of the changes:

Index: llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp
diff -u llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.7 llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.8
--- llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.7	Fri May 23 14:20:57 2003
+++ llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp	Thu Aug 14 01:04:49 2003
@@ -68,12 +68,6 @@
   bool runOnBasicBlock(BasicBlock &BB); // apply this pass to each BB
 };
 
-
-// Register the pass with llc only, and not opt...
-static RegisterLLC<PeepholeOpts>
-X("peephole", "Peephole Optimization", createPeepholeOptsPass);
-
-
 /* Apply a list of peephole optimizations to this machine instruction
  * within its local context.  They are allowed to delete MI or any
  * instruction before MI, but not 
@@ -128,7 +122,7 @@
 // createPeepholeOptsPass - Public entrypoint for peephole optimization
 // and this file as a whole...
 //
-Pass*
+FunctionPass*
 createPeepholeOptsPass(TargetMachine &T)
 {
   return new PeepholeOpts(T);




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:06:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:06:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/Sparc.cpp SparcV9CodeEmitter.cpp
Message-ID: <200308140605.h7E65Ah31816@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

Sparc.cpp updated: 1.75 -> 1.76
SparcV9CodeEmitter.cpp updated: 1.26 -> 1.27

---
Log message:

Unbreak SPARC backend: addPassesToJITCompile and
 addPassesToEmitMachineCode now both take a FunctionPassManager.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/Sparc.cpp
diff -u llvm/lib/Target/Sparc/Sparc.cpp:1.75 llvm/lib/Target/Sparc/Sparc.cpp:1.76
--- llvm/lib/Target/Sparc/Sparc.cpp:1.75	Tue Aug 12 21:38:16 2003
+++ llvm/lib/Target/Sparc/Sparc.cpp	Thu Aug 14 01:04:59 2003
@@ -225,7 +225,7 @@
 // addPassesToJITCompile - This method controls the JIT method of code
 // generation for the UltraSparc.
 //
-bool UltraSparc::addPassesToJITCompile(PassManager &PM) {
+bool UltraSparc::addPassesToJITCompile(FunctionPassManager &PM) {
   const TargetData &TD = getTargetData();
 
   PM.add(new TargetData("lli", TD.isLittleEndian(), TD.getPointerSize(),


Index: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.26 llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.27
--- llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.26	Wed Aug  6 17:19:18 2003
+++ llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp	Thu Aug 14 01:04:59 2003
@@ -20,7 +20,7 @@
 #include "SparcInternals.h"
 #include "SparcV9CodeEmitter.h"
 
-bool UltraSparc::addPassesToEmitMachineCode(PassManager &PM,
+bool UltraSparc::addPassesToEmitMachineCode(FunctionPassManager &PM,
                                             MachineCodeEmitter &MCE) {
   MachineCodeEmitter *M = &MCE;
   DEBUG(M = MachineCodeEmitter::createFilePrinterEmitter(MCE));




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:09:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:09:01 2003
Subject: [llvm-commits] CVS: llvm/lib/VMCore/Pass.cpp PassManagerT.h
Message-ID: <200308140608.h7E686K31877@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

Pass.cpp updated: 1.45 -> 1.46
PassManagerT.h updated: 1.40 -> 1.41

---
Log message:

Add new method to FunctionPassManager to add ImmutablePasses.


---
Diffs of the changes:

Index: llvm/lib/VMCore/Pass.cpp
diff -u llvm/lib/VMCore/Pass.cpp:1.45 llvm/lib/VMCore/Pass.cpp:1.46
--- llvm/lib/VMCore/Pass.cpp:1.45	Thu Aug 14 00:20:28 2003
+++ llvm/lib/VMCore/Pass.cpp	Thu Aug 14 01:07:55 2003
@@ -78,6 +78,7 @@
 FunctionPassManager::FunctionPassManager() : PM(new PassManagerT<Function>()) {}
 FunctionPassManager::~FunctionPassManager() { delete PM; }
 void FunctionPassManager::add(FunctionPass *P) { PM->add(P); }
+void FunctionPassManager::add(ImmutablePass *IP) { PM->add(IP); }
 bool FunctionPassManager::run(Function &F) { return PM->run(F); }
 
 


Index: llvm/lib/VMCore/PassManagerT.h
diff -u llvm/lib/VMCore/PassManagerT.h:1.40 llvm/lib/VMCore/PassManagerT.h:1.41
--- llvm/lib/VMCore/PassManagerT.h:1.40	Thu Aug 14 00:20:28 2003
+++ llvm/lib/VMCore/PassManagerT.h	Thu Aug 14 01:07:55 2003
@@ -444,8 +444,27 @@
     P->addToPassManager(this, AnUsage);
   }
 
-private:
+  // add - H4x0r an ImmutablePass into a PassManager that might not be
+  // expecting one.
+  //
+  void add(ImmutablePass *P) {
+    // Get information about what analyses the pass uses...
+    AnalysisUsage AnUsage;
+    P->getAnalysisUsage(AnUsage);
+    const std::vector<AnalysisID> &Required = AnUsage.getRequiredSet();
+
+    // Loop over all of the analyses used by this pass,
+    for (std::vector<AnalysisID>::const_iterator I = Required.begin(),
+           E = Required.end(); I != E; ++I) {
+      if (getAnalysisOrNullDown(*I) == 0)
+        add((PassClass*)(*I)->createPass());
+    }
 
+    // Add the ImmutablePass to this PassManager.
+    addPass(P, AnUsage);
+  }
+
+private:
   // addPass - These functions are used to implement the subclass specific
   // behaviors present in PassManager.  Basically the add(Pass*) method ends up
   // reflecting its behavior into a Pass::addToPassManager call.  Subclasses of




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:09:06 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:09:06 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/PassManager.h
Message-ID: <200308140608.h7E687e31885@niobe.cs.uiuc.edu>


Changes in directory llvm/include/llvm:

PassManager.h updated: 1.5 -> 1.6

---
Log message:

Add new method to FunctionPassManager to add ImmutablePasses.


---
Diffs of the changes:

Index: llvm/include/llvm/PassManager.h
diff -u llvm/include/llvm/PassManager.h:1.5 llvm/include/llvm/PassManager.h:1.6
--- llvm/include/llvm/PassManager.h:1.5	Tue Aug 12 12:22:39 2003
+++ llvm/include/llvm/PassManager.h	Thu Aug 14 01:07:57 2003
@@ -34,6 +34,7 @@
 };
 
 class FunctionPass;
+class ImmutablePass;
 class Function;
 
 class FunctionPassManager {
@@ -49,6 +50,11 @@
   /// passes MUST be allocated with 'new'.
   ///
   void add(FunctionPass *P);
+
+  /// add - ImmutablePasses are not FunctionPasses, so we have a 
+  /// special hack to get them into a FunctionPassManager.
+  ///
+  void add(ImmutablePass *IP);
 
   /// run - Execute all of the passes scheduled for execution.  Keep
   /// track of whether any of the passes modifies the function, and if




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:10:00 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:10:00 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/InstrScheduling.h InstrSelection.h PeepholeOpts.h RegisterAllocation.h
Message-ID: <200308140609.h7E69b631927@niobe.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

InstrScheduling.h updated: 1.10 -> 1.11
InstrSelection.h updated: 1.25 -> 1.26
PeepholeOpts.h updated: 1.1 -> 1.2
RegisterAllocation.h updated: 1.4 -> 1.5

---
Log message:

Factory methods for function passes now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/include/llvm/CodeGen/InstrScheduling.h
diff -u llvm/include/llvm/CodeGen/InstrScheduling.h:1.10 llvm/include/llvm/CodeGen/InstrScheduling.h:1.11
--- llvm/include/llvm/CodeGen/InstrScheduling.h:1.10	Tue Oct 29 11:15:01 2002
+++ llvm/include/llvm/CodeGen/InstrScheduling.h	Thu Aug 14 01:09:27 2003
@@ -8,7 +8,7 @@
 #ifndef LLVM_CODEGEN_INSTR_SCHEDULING_H
 #define LLVM_CODEGEN_INSTR_SCHEDULING_H
 
-class Pass;
+class FunctionPass;
 class TargetMachine;
 
 //---------------------------------------------------------------------------
@@ -21,6 +21,6 @@
 //   are still in SSA form.
 //---------------------------------------------------------------------------
 
-Pass *createInstructionSchedulingWithSSAPass(const TargetMachine &Target);
+FunctionPass *createInstructionSchedulingWithSSAPass(const TargetMachine &Target);
 
 #endif


Index: llvm/include/llvm/CodeGen/InstrSelection.h
diff -u llvm/include/llvm/CodeGen/InstrSelection.h:1.25 llvm/include/llvm/CodeGen/InstrSelection.h:1.26
--- llvm/include/llvm/CodeGen/InstrSelection.h:1.25	Mon Jun 30 16:58:30 2003
+++ llvm/include/llvm/CodeGen/InstrSelection.h	Thu Aug 14 01:09:27 2003
@@ -15,7 +15,7 @@
 class InstructionNode;
 class TargetMachine;
 class MachineCodeForInstruction;
-class Pass;
+class FunctionPass;
 
 //===--------------------- Required Functions ---------------------------------
 // Target-dependent functions that MUST be implemented for each target.
@@ -43,7 +43,7 @@
 //   Return a pass that performs machine dependant instruction selection.
 //---------------------------------------------------------------------------
 
-Pass *createInstructionSelectionPass(TargetMachine &Target);
+FunctionPass *createInstructionSelectionPass(TargetMachine &Target);
 
 
 //************************ Exported Data Types *****************************/


Index: llvm/include/llvm/CodeGen/PeepholeOpts.h
diff -u llvm/include/llvm/CodeGen/PeepholeOpts.h:1.1 llvm/include/llvm/CodeGen/PeepholeOpts.h:1.2
--- llvm/include/llvm/CodeGen/PeepholeOpts.h:1.1	Fri Sep 20 11:33:03 2002
+++ llvm/include/llvm/CodeGen/PeepholeOpts.h	Thu Aug 14 01:09:27 2003
@@ -8,8 +8,8 @@
 #define LLVM_CODEGEN_PEEPHOLE_OPTS_H
 
 class TargetMachine;
-class Pass;
+class FunctionPass;
 
-Pass *createPeepholeOptsPass(TargetMachine &Target);
+FunctionPass *createPeepholeOptsPass(TargetMachine &Target);
 
 #endif


Index: llvm/include/llvm/CodeGen/RegisterAllocation.h
diff -u llvm/include/llvm/CodeGen/RegisterAllocation.h:1.4 llvm/include/llvm/CodeGen/RegisterAllocation.h:1.5
--- llvm/include/llvm/CodeGen/RegisterAllocation.h:1.4	Tue Oct 29 10:34:12 2002
+++ llvm/include/llvm/CodeGen/RegisterAllocation.h	Thu Aug 14 01:09:27 2003
@@ -7,13 +7,13 @@
 #ifndef LLVM_CODEGEN_REGISTERALLOCATION_H
 #define LLVM_CODEGEN_REGISTERALLOCATION_H
 
-class Pass;
+class FunctionPass;
 class TargetMachine;
 
 //----------------------------------------------------------------------------
 // Entry point for register allocation for a module
 //----------------------------------------------------------------------------
 
-Pass *getRegisterAllocator(TargetMachine &T);
+FunctionPass *getRegisterAllocator(TargetMachine &T);
 
 #endif




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:10:06 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:10:06 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Transforms/Scalar.h
Message-ID: <200308140609.h7E69cj31935@niobe.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Transforms:

Scalar.h updated: 1.19 -> 1.20

---
Log message:

Factory methods for function passes now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/include/llvm/Transforms/Scalar.h
diff -u llvm/include/llvm/Transforms/Scalar.h:1.19 llvm/include/llvm/Transforms/Scalar.h:1.20
--- llvm/include/llvm/Transforms/Scalar.h:1.19	Wed Aug 13 13:18:11 2003
+++ llvm/include/llvm/Transforms/Scalar.h	Thu Aug 14 01:09:28 2003
@@ -72,7 +72,7 @@
 // index of [0]).
 
 // This pass decomposes all multi-dimensional references in a function.
-Pass *createDecomposeMultiDimRefsPass();
+FunctionPass *createDecomposeMultiDimRefsPass();
 
 // This function decomposes a single instance of such a reference.
 // Return value: true if the instruction was replaced; false otherwise.
@@ -238,7 +238,7 @@
 // These two passes convert malloc and free instructions to and from %malloc &
 // %free function calls.
 //
-Pass *createLowerAllocationsPass();
+FunctionPass *createLowerAllocationsPass();
 Pass *createRaiseAllocationsPass();
 
 //===----------------------------------------------------------------------===//




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:10:11 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:10:11 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
Message-ID: <200308140609.h7E69d031943@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/InstrSched:

InstrScheduling.cpp updated: 1.54 -> 1.55

---
Log message:

Factory methods for function passes now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
diff -u llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.54 llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.55
--- llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.54	Sat Jul 26 18:23:41 2003
+++ llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp	Thu Aug 14 01:09:29 2003
@@ -1491,6 +1491,6 @@
 }
 
 
-Pass *createInstructionSchedulingWithSSAPass(const TargetMachine &tgt) {
+FunctionPass *createInstructionSchedulingWithSSAPass(const TargetMachine &tgt) {
   return new InstructionSchedulingWithSSA(tgt);
 }




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:10:17 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:10:17 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
Message-ID: <200308140609.h7E69ee31952@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/RegAlloc:

PhyRegAlloc.cpp updated: 1.104 -> 1.105

---
Log message:

Factory methods for function passes now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.104 llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.105
--- llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp:1.104	Tue Aug 12 17:22:24 2003
+++ llvm/lib/CodeGen/RegAlloc/PhyRegAlloc.cpp	Thu Aug 14 01:09:30 2003
@@ -74,7 +74,7 @@
   };
 }
 
-Pass *getRegisterAllocator(TargetMachine &T) {
+FunctionPass *getRegisterAllocator(TargetMachine &T) {
   return new RegisterAllocator(T);
 }
 




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:10:22 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:10:22 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp
Message-ID: <200308140609.h7E69fU31960@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

PrologEpilogCodeInserter.cpp updated: 1.28 -> 1.29

---
Log message:

Factory methods for function passes now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp
diff -u llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp:1.28 llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp:1.29
--- llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp:1.28	Sat Jul 26 18:04:00 2003
+++ llvm/lib/Target/Sparc/PrologEpilogCodeInserter.cpp	Thu Aug 14 01:09:31 2003
@@ -167,6 +167,6 @@
   }
 }
 
-Pass* UltraSparc::getPrologEpilogInsertionPass() {
+FunctionPass *UltraSparc::getPrologEpilogInsertionPass() {
   return new InsertPrologEpilogCode();
 }




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 01:10:27 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 01:10:27 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp LowerAllocations.cpp
Message-ID: <200308140609.h7E69gK31970@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

DecomposeMultiDimRefs.cpp updated: 1.27 -> 1.28
LowerAllocations.cpp updated: 1.36 -> 1.37

---
Log message:

Factory methods for function passes now return type FunctionPass *.


---
Diffs of the changes:

Index: llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp
diff -u llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp:1.27 llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp:1.28
--- llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp:1.27	Wed Apr 23 11:37:42 2003
+++ llvm/lib/Transforms/Scalar/DecomposeMultiDimRefs.cpp	Thu Aug 14 01:09:32 2003
@@ -29,7 +29,7 @@
 RegisterOpt<DecomposePass> X("lowerrefs", "Decompose multi-dimensional "
                              "structure/array references");
 
-Pass
+FunctionPass
 *createDecomposeMultiDimRefsPass()
 {
   return new DecomposePass();


Index: llvm/lib/Transforms/Scalar/LowerAllocations.cpp
diff -u llvm/lib/Transforms/Scalar/LowerAllocations.cpp:1.36 llvm/lib/Transforms/Scalar/LowerAllocations.cpp:1.37
--- llvm/lib/Transforms/Scalar/LowerAllocations.cpp:1.36	Thu May 15 13:25:13 2003
+++ llvm/lib/Transforms/Scalar/LowerAllocations.cpp	Thu Aug 14 01:09:32 2003
@@ -47,7 +47,7 @@
 }
 
 // createLowerAllocationsPass - Interface to this file...
-Pass *createLowerAllocationsPass() {
+FunctionPass *createLowerAllocationsPass() {
   return new LowerAllocations();
 }
 




From lattner at cs.uiuc.edu  Thu Aug 14 09:44:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 09:44:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp
Message-ID: <200308141443.JAA28100@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/PostOpts:

PeepholeOpts.cpp updated: 1.8 -> 1.9

---
Log message:

Restore 'nice name' to pass


---
Diffs of the changes:

Index: llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp
diff -u llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.8 llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.9
--- llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp:1.8	Thu Aug 14 01:04:49 2003
+++ llvm/lib/CodeGen/PostOpts/PeepholeOpts.cpp	Thu Aug 14 09:43:24 2003
@@ -66,6 +66,7 @@
 public:
   PeepholeOpts(const TargetMachine &T): target(T) { }
   bool runOnBasicBlock(BasicBlock &BB); // apply this pass to each BB
+  virtual const char *getPassName() const { return "Peephole Optimization"; }
 };
 
 /* Apply a list of peephole optimizations to this machine instruction




From brukman at cs.uiuc.edu  Thu Aug 14 10:17:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Aug 14 10:17:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcV9_F2.td SparcV9_F3.td SparcV9_F4.td SparcV9_Reg.td SparcV9.td
Message-ID: <200308141516.KAA03416@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcV9_F2.td updated: 1.6 -> 1.7
SparcV9_F3.td updated: 1.15 -> 1.16
SparcV9_F4.td updated: 1.8 -> 1.9
SparcV9_Reg.td updated: 1.4 -> 1.5
SparcV9.td updated: 1.27 -> 1.28

---
Log message:

Since we now have TableGen editing modes for VIM and (X)Emacs, we no longer need
to mark TableGen description files with "C++ mode".


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcV9_F2.td
diff -u llvm/lib/Target/Sparc/SparcV9_F2.td:1.6 llvm/lib/Target/Sparc/SparcV9_F2.td:1.7
--- llvm/lib/Target/Sparc/SparcV9_F2.td:1.6	Tue Aug  5 09:34:38 2003
+++ llvm/lib/Target/Sparc/SparcV9_F2.td	Thu Aug 14 10:16:28 2003
@@ -1,5 +1,5 @@
-//===- Sparc.td - Target Description for Sparc V9 Target --------*- C++ -*-===//
-// vim:ft=cpp
+//===- SparcV9_F2.td - Format 2 instructions: Sparc V9 Target -------------===//
+//
 //===----------------------------------------------------------------------===//
 
 //===----------------------------------------------------------------------===//


Index: llvm/lib/Target/Sparc/SparcV9_F3.td
diff -u llvm/lib/Target/Sparc/SparcV9_F3.td:1.15 llvm/lib/Target/Sparc/SparcV9_F3.td:1.16
--- llvm/lib/Target/Sparc/SparcV9_F3.td:1.15	Mon Aug  4 00:03:18 2003
+++ llvm/lib/Target/Sparc/SparcV9_F3.td	Thu Aug 14 10:16:28 2003
@@ -1,5 +1,5 @@
-//===- Sparc.td - Target Description for Sparc V9 Target --------*- C++ -*-===//
-// vim:ft=cpp
+//===- SparcV9_F3.td - Format 3 Instructions: Sparc V9 Target -------------===//
+//
 //===----------------------------------------------------------------------===//
 
 //===----------------------------------------------------------------------===//


Index: llvm/lib/Target/Sparc/SparcV9_F4.td
diff -u llvm/lib/Target/Sparc/SparcV9_F4.td:1.8 llvm/lib/Target/Sparc/SparcV9_F4.td:1.9
--- llvm/lib/Target/Sparc/SparcV9_F4.td:1.8	Mon Aug  4 00:03:18 2003
+++ llvm/lib/Target/Sparc/SparcV9_F4.td	Thu Aug 14 10:16:28 2003
@@ -1,5 +1,5 @@
-//===- Sparc.td - Target Description for Sparc V9 Target --------*- C++ -*-===//
-// vim:ft=cpp
+//===- SparcV9_F4.td - Format 4 instructions: Sparc V9 Target -------------===//
+//
 //===----------------------------------------------------------------------===//
 
 //----------------------- F4 classes -----------------------------------------


Index: llvm/lib/Target/Sparc/SparcV9_Reg.td
diff -u llvm/lib/Target/Sparc/SparcV9_Reg.td:1.4 llvm/lib/Target/Sparc/SparcV9_Reg.td:1.5
--- llvm/lib/Target/Sparc/SparcV9_Reg.td:1.4	Mon Aug  4 00:03:18 2003
+++ llvm/lib/Target/Sparc/SparcV9_Reg.td	Thu Aug 14 10:16:28 2003
@@ -1,5 +1,5 @@
-//===- Sparc.td - Target Description for Sparc V9 Target --------*- C++ -*-===//
-// vim:ft=cpp
+//===- SparcV9_Reg.td - Sparc V9 Register definitions ---------------------===//
+//
 //===----------------------------------------------------------------------===//
 
 //===----------------------------------------------------------------------===//


Index: llvm/lib/Target/Sparc/SparcV9.td
diff -u llvm/lib/Target/Sparc/SparcV9.td:1.27 llvm/lib/Target/Sparc/SparcV9.td:1.28
--- llvm/lib/Target/Sparc/SparcV9.td:1.27	Mon Aug  4 00:03:18 2003
+++ llvm/lib/Target/Sparc/SparcV9.td	Thu Aug 14 10:16:28 2003
@@ -1,5 +1,5 @@
-//===- Sparc.td - Target Description for Sparc V9 Target --------*- C++ -*-===//
-// vim:ft=cpp
+//===- SparcV9.td - Target Description for Sparc V9 Target ----------------===//
+//
 //===----------------------------------------------------------------------===//
 
 include "../Target.td"




From brukman at cs.uiuc.edu  Thu Aug 14 10:27:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Aug 14 10:27:01 2003
Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl
Message-ID: <200308141526.KAA03490@zion.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTest.pl updated: 1.18 -> 1.19

---
Log message:

* Enable SPEC testing in the `configure' script command line
* Switched from using `m||' to `m##' because VIM mis-highlights `m||'
* Simplified the regex getting the file version number


---
Diffs of the changes:

Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.18 llvm/utils/NightlyTest.pl:1.19
--- llvm/utils/NightlyTest.pl:1.18	Wed Aug  6 11:02:50 2003
+++ llvm/utils/NightlyTest.pl	Thu Aug 14 10:26:28 2003
@@ -151,7 +151,7 @@
 # Build the entire tree, saving build messages to the build log
 #
 if (!$NOCHECKOUT) {
-  system "(time -p ./configure --enable-jit --with-objroot=.) > $Prefix-Build-Log.txt 2>&1";
+  system "(time -p ./configure --enable-jit --enable-spec --with-objroot=.) > $Prefix-Build-Log.txt 2>&1";
 
   # Build the entire tree, capturing the output into $Prefix-Build-Log.txt
   system "(time -p gmake $MAKEOPTS) >> $Prefix-Build-Log.txt 2>&1";
@@ -186,7 +186,7 @@
 foreach $Warning (@Warn) {
   if ($Warning =~ m/Entering directory \`([^\`]+)\'/) {
     $CurDir = $1;                 # Keep track of directory warning is in...
-    if ($CurDir =~ m|$BuildDir/llvm/(.*)|) { # Remove buildir prefix if included
+    if ($CurDir =~ m#$BuildDir/llvm/(.*)#) { # Remove buildir prefix if included
       $CurDir = $1;
     }
   } else {
@@ -219,7 +219,7 @@
 # Loop over every record from the CVS history, filling in the hashes.
 foreach $File (@CVSHistory) {
   my ($Type, $Date, $UID, $Rev, $Filename);
-  if ($File =~ /([AMRUGC]) ($DateRE) ([^ ]+) +([0-9\.]+) +([^ ]+) +([^ ]+)/) {
+  if ($File =~ /([AMRUGC]) ($DateRE) ([^ ]+) +([^ ]+) +([^ ]+) +([^ ]+)/) {
     ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, $4, "$6/$5");
   } elsif ($File =~ /([W]) ($DateRE) ([^ ]+) +([^ ]+) +([^ ]+)/) {
     ($Type, $Date, $UID, $Rev, $Filename) = ($1, $2, $3, $4, "$6/$5");




From brukman at cs.uiuc.edu  Thu Aug 14 11:06:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Aug 14 11:06:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/TableGen.cpp
Message-ID: <200308141605.LAA03949@zion.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

TableGen.cpp updated: 1.18 -> 1.19

---
Log message:

Using `std::remove' requires `cstdio.h'.


---
Diffs of the changes:

Index: llvm/utils/TableGen/TableGen.cpp
diff -u llvm/utils/TableGen/TableGen.cpp:1.18 llvm/utils/TableGen/TableGen.cpp:1.19
--- llvm/utils/TableGen/TableGen.cpp:1.18	Tue Aug  5 23:47:56 2003
+++ llvm/utils/TableGen/TableGen.cpp	Thu Aug 14 11:05:35 2003
@@ -17,6 +17,7 @@
 #include "InstrInfoEmitter.h"
 #include "InstrSelectorEmitter.h"
 #include <algorithm>
+#include <cstdio>
 #include <fstream>
 
 enum ActionType {




From brukman at cs.uiuc.edu  Thu Aug 14 11:24:01 2003
From: brukman at cs.uiuc.edu (Michael Brukman)
Date: Thu Aug 14 11:24:01 2003
Subject: [llvm-commits] CVS: llvm/www/testresults/index.html
Message-ID: <200308141623.LAA19709@tank.cs.uiuc.edu>


Changes in directory llvm/www/testresults:

index.html updated: 1.1 -> 1.2

---
Log message:

* Add link to Sparc automated tests
* Comment-out unused entry
* Label entries with which machines test run on


---
Diffs of the changes:

Index: llvm/www/testresults/index.html
diff -u llvm/www/testresults/index.html:1.1 llvm/www/testresults/index.html:1.2
--- llvm/www/testresults/index.html:1.1	Sun Jan 19 23:45:46 2003
+++ llvm/www/testresults/index.html	Thu Aug 14 11:23:02 2003
@@ -12,9 +12,12 @@
 
 Platforms:<p>
 <ol>
-<li><a href="X86/">Linux on X86 (Dual Athlon 2100+)</a>
-<li>Solaris on Sparc V9 (UltraSPARC-IIi at 440MHz) <!-- Tank -->
-<li>Solaris on Sparc V9 (whatever trinity is)
+<!-- zion -->
+<li><a href="X86/">Linux on X86 (Dual P4 Xeon @ 3.06GHz)</a>
+<!-- trinity -->
+<li><a href="Sparc/">Solaris on Sparc V9 (UltraSparc IIe @ 502 MHz)</a>
+<!-- tank -->
+<!-- <li>Solaris on Sparc V9 (UltraSPARC-IIi at 440MHz) -->
 </ol>
 
 <hr>




From brukman at cs.uiuc.edu  Thu Aug 14 11:40:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Aug 14 11:40:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.Makefile
Message-ID: <200308141639.LAA04111@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.20 -> 1.21

---
Log message:

* Test correctness of LLC-compiled program, not just successful compilation
* Made LLC output status format consistent with the JIT
* Fix indentation


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.20 llvm/test/Programs/TEST.nightly.Makefile:1.21
--- llvm/test/Programs/TEST.nightly.Makefile:1.20	Wed Aug 13 12:34:56 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Thu Aug 14 11:39:10 2003
@@ -50,17 +50,17 @@
 
 # LLC tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.llc.report.txt): \
-Output/%.nightly.llc.report.txt: Output/%.llvm.bc $(LLC)
+Output/%.nightly.llc.report.txt: Output/%.llvm.bc Output/%.exe-llc $(LLC)
 	@echo > $@
-	@echo 'time -p $(LLC) -f $(TIMEOPT) $< -o /dev/null) > $@ 2>&1'
-	@-if (time -p $(LLC) -f $(TIMEOPT) $< -o /dev/null) >> $@ 2>&1; then \
+	-head -n 100 Output/$*.exe-llc >> $@
+	@-if test -f Output/$*.exe-llc; then \
 	  echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
-	  printf "TEST-RESULT-llc: " >> $@;\
-	  grep "Total Execution Time" $@.info >> $@;\
-	  echo >> $@;\
-	  printf "TEST-RESULT-llc: " >> $@;\
+	  printf "TEST-RESULT-llc-time: " >> $@;\
 	  grep "^real" $@ >> $@;\
 	  echo >> $@;\
+	  printf "TEST-RESULT-llc-comptime: " >> $@;\
+	  grep "Total Execution Time" $@.info >> $@;\
+	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: llc $(RELDIR)/$*" >> $@;\
 	fi
@@ -73,13 +73,13 @@
 	-head -n 100 Output/$*.exe-cbe >> $@
 	@-if test -f Output/$*.exe-cbe; then \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
-          echo "TEST-RESULT-cbe: YES" >> $@;\
+	  echo "TEST-RESULT-cbe: YES" >> $@;\
 	  printf "TEST-RESULT-cbe-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)cbe.time >> $@;\
 	  echo >> $@;\
-        else  \
+	else  \
 	  echo "TEST-FAIL: cbe $(RELDIR)/$*" >> $@;\
-        fi
+	fi
 
 # JIT tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.jit.report.txt): \
@@ -87,7 +87,7 @@
 	@echo > $@
 	-head -n 100 Output/$*.exe-jit >> $@
 	@-if test -f Output/$*.exe-jit; then \
-          echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
+	  echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-jit-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)jit.time >> $@;\
 	  echo >> $@;\




From lattner at cs.uiuc.edu  Thu Aug 14 13:36:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 13:36:00 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/JIT/Emitter.cpp
Message-ID: <200308141835.NAA05198@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/lli/JIT:

Emitter.cpp updated: 1.22 -> 1.23

---
Log message:

Implement a _REAL_ memory manager for the code generated by the JIT.  This 
speeds up program execution by 15% pretty consistently for large programs


---
Diffs of the changes:

Index: llvm/tools/lli/JIT/Emitter.cpp
diff -u llvm/tools/lli/JIT/Emitter.cpp:1.22 llvm/tools/lli/JIT/Emitter.cpp:1.23
--- llvm/tools/lli/JIT/Emitter.cpp:1.22	Tue Aug  5 12:00:32 2003
+++ llvm/tools/lli/JIT/Emitter.cpp	Thu Aug 14 13:35:27 2003
@@ -21,7 +21,102 @@
   Statistic<> NumBytes("jello", "Number of bytes of machine code compiled");
   VM *TheVM = 0;
 
+  /// JITMemoryManager - Manage memory for the JIT code generation in a logical,
+  /// sane way.  This splits a large block of MAP_NORESERVE'd memory into two
+  /// sections, one for function stubs, one for the functions themselves.  We
+  /// have to do this because we may need to emit a function stub while in the
+  /// middle of emitting a function, and we don't know how large the function we
+  /// are emitting is.  This never bothers to release the memory, because when
+  /// we are ready to destroy the JIT, the program exits.
+  class JITMemoryManager {
+    unsigned char *MemBase;      // Base of block of memory, start of stub mem
+    unsigned char *FunctionBase; // Start of the function body area
+    unsigned char *CurStubPtr, *CurFunctionPtr;
+  public:
+    JITMemoryManager();
+    
+    inline unsigned char *allocateStub(unsigned StubSize);
+    inline unsigned char *startFunctionBody();
+    inline void endFunctionBody(unsigned char *FunctionEnd);    
+  };
+}
+
+#define _POSIX_MAPPED_FILES
+#include <unistd.h>
+#include <sys/mman.h>
+
+// getMemory - Return a pointer to the specified number of bytes, which is
+// mapped as executable readable and writable.
+static void *getMemory(unsigned NumBytes) {
+  if (NumBytes == 0) return 0;
+  static const long pageSize = sysconf(_SC_PAGESIZE);
+  unsigned NumPages = (NumBytes+pageSize-1)/pageSize;
+
+#if defined(i386) || defined(__i386__) || defined(__x86__)
+  /* Linux and *BSD tend to have these flags named differently. */
+#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
+# define MAP_ANONYMOUS MAP_ANON
+#endif /* defined(MAP_ANON) && !defined(MAP_ANONYMOUS) */
+#define fd  0
+#elif defined(sparc) || defined(__sparc__) || defined(__sparcv9)
+#define fd -1
+#else
+  std::cerr << "This architecture is not supported by the JIT!\n";
+  abort();
+#endif
+  
+  unsigned mmapFlags = MAP_PRIVATE|MAP_ANONYMOUS;
+#ifdef MAP_NORESERVE
+  mmapFlags |= MAP_NORESERVE;
+#endif
+
+  void *pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC,
+                  MAP_PRIVATE|MAP_ANONYMOUS, fd, 0);
+  if (pa == MAP_FAILED) {
+    perror("mmap");
+    abort();
+  }
+  return pa;
+}
+
+JITMemoryManager::JITMemoryManager() {
+  // Allocate a 16M block of memory...
+  MemBase = (unsigned char*)getMemory(16 << 20);
+  FunctionBase = MemBase + 512*1024; // Use 512k for stubs
+
+  // Allocate stubs backwards from the function base, allocate functions forward
+  // from the function base.
+  CurStubPtr = CurFunctionPtr = FunctionBase;
+}
+
+unsigned char *JITMemoryManager::allocateStub(unsigned StubSize) {
+  CurStubPtr -= StubSize;
+  if (CurStubPtr < MemBase) {
+    std::cerr << "JIT ran out of memory for function stubs!\n";
+    abort();
+  }
+  return CurStubPtr;
+}
+
+unsigned char *JITMemoryManager::startFunctionBody() {
+  // Round up to an even multiple of 4 bytes, this should eventually be target
+  // specific.
+  return (unsigned char*)(((intptr_t)CurFunctionPtr + 3) & ~3);
+}
+
+void JITMemoryManager::endFunctionBody(unsigned char *FunctionEnd) {
+  assert(FunctionEnd > CurFunctionPtr);
+  CurFunctionPtr = FunctionEnd;
+}
+
+
+
+namespace {
+  /// Emitter - The JIT implementation of the MachineCodeEmiter, which is used
+  /// to output functions to memory for execution.
   class Emitter : public MachineCodeEmitter {
+    JITMemoryManager MemMgr;
+
     // CurBlock - The start of the current block of memory.  CurByte - The
     // current byte being emitted to.
     unsigned char *CurBlock, *CurByte;
@@ -62,47 +157,13 @@
   return new Emitter(V);
 }
 
-
-#define _POSIX_MAPPED_FILES
-#include <unistd.h>
-#include <sys/mman.h>
-
-// FIXME: This should be rewritten to support a real memory manager for
-// executable memory pages!
-static void *getMemory(unsigned NumPages) {
-  void *pa;
-  if (NumPages == 0) return 0;
-  static const long pageSize = sysconf(_SC_PAGESIZE);
-
-#if defined(i386) || defined(__i386__) || defined(__x86__)
-  /* Linux and *BSD tend to have these flags named differently. */
-#if defined(MAP_ANON) && !defined(MAP_ANONYMOUS)
-# define MAP_ANONYMOUS MAP_ANON
-#endif /* defined(MAP_ANON) && !defined(MAP_ANONYMOUS) */
-#define fd  0
-#elif defined(sparc) || defined(__sparc__) || defined(__sparcv9)
-#define fd -1
-#else
-  std::cerr << "This architecture is not supported by the JIT!\n";
-  abort();
-#endif
-  pa = mmap(0, pageSize*NumPages, PROT_READ|PROT_WRITE|PROT_EXEC,
-            MAP_PRIVATE|MAP_ANONYMOUS, fd, 0);
-  if (pa == MAP_FAILED) {
-    perror("mmap");
-    abort();
-  }
-  return pa;
-}
-
-
 void Emitter::startFunction(MachineFunction &F) {
-  CurBlock = (unsigned char *)getMemory(16);
-  CurByte = CurBlock;  // Start writing at the beginning of the fn.
+  CurByte = CurBlock = MemMgr.startFunctionBody();
   TheVM->addGlobalMapping(F.getFunction(), CurBlock);
 }
 
 void Emitter::finishFunction(MachineFunction &F) {
+  MemMgr.endFunctionBody(CurByte);
   ConstantPoolAddresses.clear();
   NumBytes += CurByte-CurBlock;
 
@@ -124,11 +185,8 @@
 }
 
 void Emitter::startFunctionStub(const Function &F, unsigned StubSize) {
-  static const long pageSize = sysconf(_SC_PAGESIZE);
   SavedCurBlock = CurBlock;  SavedCurByte = CurByte;
-  // FIXME: this is a huge waste of memory.
-  CurBlock = (unsigned char *)getMemory((StubSize+pageSize-1)/pageSize);
-  CurByte = CurBlock;  // Start writing at the beginning of the fn.
+  CurByte = CurBlock = MemMgr.allocateStub(StubSize);
 }
 
 void *Emitter::finishFunctionStub(const Function &F) {
@@ -147,8 +205,8 @@
 }
 
 void Emitter::emitWord(unsigned W) {
-  // FIXME: This won't work if the endianness of the host and target don't
-  // agree!  (For a JIT this can't happen though.  :)
+  // This won't work if the endianness of the host and target don't agree!  (For
+  // a JIT this can't happen though.  :)
   *(unsigned*)CurByte = W;
   CurByte += sizeof(unsigned);
 }




From lattner at cs.uiuc.edu  Thu Aug 14 14:01:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 14:01:01 2003
Subject: [llvm-commits] CVS: llvm/autoconf/configure.ac
Message-ID: <200308141900.OAA07484@apoc.cs.uiuc.edu>


Changes in directory llvm/autoconf:

configure.ac updated: 1.4 -> 1.5

---
Log message:

I just moved papi to a new directory


---
Diffs of the changes:

Index: llvm/autoconf/configure.ac
diff -u llvm/autoconf/configure.ac:1.4 llvm/autoconf/configure.ac:1.5
--- llvm/autoconf/configure.ac:1.4	Thu Jul 31 11:45:37 2003
+++ llvm/autoconf/configure.ac	Thu Aug 14 13:59:53 2003
@@ -305,7 +305,7 @@
 AC_ARG_WITH(bcrepos,AC_HELP_STRING([--with-bcrepos],[Location of Bytecode Repository]),AC_SUBST(BCR,[$withval]),AC_SUBST(BCR,[/home/vadve/lattner/LLVMPrograms]))
 
 dnl Location of PAPI
-AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/papi-2.3.4.1]))
+AC_ARG_WITH(papi,AC_HELP_STRING([--with-papi],[Location of PAPI]),AC_SUBST(PAPIDIR,[$withval]),AC_SUBST(PAPIDIR,[/home/vadve/shared/Sparc/papi-2.3.4.1]))
 
 dnl Location of the purify program
 AC_ARG_WITH(purify,AC_HELP_STRING([--with-purify],[Location of purify program]),AC_SUBST(PURIFY,[$withval]))




From lattner at cs.uiuc.edu  Thu Aug 14 14:21:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 14:21:02 2003
Subject: [llvm-commits] CVS: llvm/lib/CWriter/Writer.cpp
Message-ID: <200308141920.OAA08615@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CWriter:

Writer.cpp updated: 1.114 -> 1.115

---
Log message:

Stop annoying warnings about mismatched types with the argument of a free
implement more constant expressions so that 176.gcc compiles with the CBE


---
Diffs of the changes:

Index: llvm/lib/CWriter/Writer.cpp
diff -u llvm/lib/CWriter/Writer.cpp:1.114 llvm/lib/CWriter/Writer.cpp:1.115
--- llvm/lib/CWriter/Writer.cpp:1.114	Wed Aug  6 13:04:40 2003
+++ llvm/lib/CWriter/Writer.cpp	Thu Aug 14 14:19:53 2003
@@ -369,16 +369,32 @@
       Out << "))";
       return;
     case Instruction::Add:
-      Out << "(";
-      printConstant(CE->getOperand(0));
-      Out << " + ";
-      printConstant(CE->getOperand(1));
-      Out << ")";
-      return;
     case Instruction::Sub:
+    case Instruction::Mul:
+    case Instruction::Div:
+    case Instruction::Rem:
+    case Instruction::SetEQ:
+    case Instruction::SetNE:
+    case Instruction::SetLT:
+    case Instruction::SetLE:
+    case Instruction::SetGT:
+    case Instruction::SetGE:
       Out << "(";
       printConstant(CE->getOperand(0));
-      Out << " - ";
+      switch (CE->getOpcode()) {
+      case Instruction::Add: Out << " + "; break;
+      case Instruction::Sub: Out << " - "; break;
+      case Instruction::Mul: Out << " * "; break;
+      case Instruction::Div: Out << " / "; break;
+      case Instruction::Rem: Out << " % "; break;
+      case Instruction::SetEQ: Out << " == "; break;
+      case Instruction::SetNE: Out << " != "; break;
+      case Instruction::SetLT: Out << " < "; break;
+      case Instruction::SetLE: Out << " <= "; break;
+      case Instruction::SetGT: Out << " > "; break;
+      case Instruction::SetGE: Out << " >= "; break;
+      default: assert(0 && "Illegal opcode here!");
+      }
       printConstant(CE->getOperand(1));
       Out << ")";
       return;
@@ -1186,7 +1202,7 @@
 }
 
 void CWriter::visitFreeInst(FreeInst &I) {
-  Out << "free(";
+  Out << "free((char*)";
   writeOperand(I.getOperand(0));
   Out << ")";
 }




From vadve at cs.uiuc.edu  Thu Aug 14 15:47:01 2003
From: vadve at cs.uiuc.edu (Vikram Adve)
Date: Thu Aug 14 15:47:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp
Message-ID: <200308142046.PAA29396@tank.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/LiveVar:

FunctionLiveVarInfo.cpp updated: 1.45 -> 1.46

---
Log message:

Improvement to the previous fix: branch following a delay slot of
another delayed instr. would cause the later sanity-check (assertion)
in PhyRegAlloc.cpp to fail, even though there is really no error.


---
Diffs of the changes:

Index: llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp
diff -u llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.45 llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.46
--- llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp:1.45	Tue Aug 12 17:19:59 2003
+++ llvm/lib/Analysis/LiveVar/FunctionLiveVarInfo.cpp	Thu Aug 14 15:45:56 2003
@@ -290,9 +290,11 @@
       for (unsigned i = 0; i < DS; ++i, ++fwdMII) {
         assert(fwdMII != MIVec.end() && "Missing instruction in delay slot?");
         MachineInstr* DelaySlotMI = *fwdMII;
-        set_union(*MInst2LVSetBI[DelaySlotMI], *NewSet);
-        if (i+1 == DS)
-          set_union(*MInst2LVSetAI[DelaySlotMI], *NewSet);
+        if (! TM.getInstrInfo().isNop(DelaySlotMI->getOpCode())) {
+          set_union(*MInst2LVSetBI[DelaySlotMI], *NewSet);
+          if (i+1 == DS)
+            set_union(*MInst2LVSetAI[DelaySlotMI], *NewSet);
+        }
       }
     }
 




From lattner at cs.uiuc.edu  Thu Aug 14 15:56:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 15:56:01 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libc/atox.c
Message-ID: <200308142055.PAA16642@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libc:

atox.c updated: 1.1 -> 1.2

---
Log message:

Disable this support stuff, it doesn't work under linux anyway


---
Diffs of the changes:

Index: llvm/test/Libraries/libc/atox.c
diff -u llvm/test/Libraries/libc/atox.c:1.1 llvm/test/Libraries/libc/atox.c:1.2
--- llvm/test/Libraries/libc/atox.c:1.1	Fri Mar  8 17:20:39 2002
+++ llvm/test/Libraries/libc/atox.c	Thu Aug 14 15:55:38 2003
@@ -23,6 +23,7 @@
 #define LONG_MIN        ((long)(~LONG_MAX))             /* 0x80000000 */
 #endif
 
+#if 0
 /*
  * Convert a string to a long integer.
  *
@@ -114,3 +115,4 @@
 long int atol(const char *nptr) {
   return strtol(nptr, 0, 10);
 }
+#endif




From lattner at cs.uiuc.edu  Thu Aug 14 16:11:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 16:11:02 2003
Subject: [llvm-commits] CVS: llvm/Makefile.common
Message-ID: <200308142110.QAA18466@apoc.cs.uiuc.edu>


Changes in directory llvm:

Makefile.common updated: 1.110 -> 1.111

---
Log message:

Simplifications to Makefile.common, remove support for Purify since it was
broken by libtoolification anyways, and noone can use it because purify doesn't
support the 64-bit sparc compilers even if it weren't broken!



---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.110 llvm/Makefile.common:1.111
--- llvm/Makefile.common:1.110	Tue Aug 12 13:51:48 2003
+++ llvm/Makefile.common	Thu Aug 14 16:10:25 2003
@@ -140,6 +140,11 @@
 all:: dynamic
 endif
 
+ifdef BYTECODE_LIBRARY
+# if BYTECODE_LIBRARY is specified, the default is to build the bytecode lib
+all:: bytecodelib
+endif
+
 # Default Rule:  Make sure it's also a :: rule
 all ::
 
@@ -167,7 +172,7 @@
 # slightly since GNU Make will not try to find implicit rules for targets
 # which are marked as Phony.
 #
-.PHONY: all dynamic clean distclean install test bytecode prdirs
+.PHONY: all dynamic bytecodelib clean distclean install test bytecode prdirs
 
 ###########################################################################
 # Miscellaneous paths and commands:
@@ -185,8 +190,6 @@
 
 BURG_OPTS = -I
 
-PURIFY := $(PURIFY) -cache-dir="$(BUILD_OBJ_ROOT)/../purifycache" -chain-length="30" -messages=all 
-
 ifdef ENABLE_PROFILING
   ENABLE_OPTIMIZED = 1
   CONFIGURATION := Profile
@@ -265,11 +268,7 @@
 #
 # Libtool is found in the current directory.
 #
-ifdef VERBOSE
-LIBTOOL=$(LLVM_SRC_ROOT)/mklib
-else
-LIBTOOL=$(LLVM_SRC_ROOT)/mklib --silent
-endif
+LIBTOOL := $(LLVM_SRC_ROOT)/mklib
 
 #
 # If we're not building a shared library, use the disable-shared tag with
@@ -283,7 +282,7 @@
 # versions of libtool.
 #
 ifndef SHARED_LIBRARY
-LIBTOOL := $(LIBTOOL) --tag=disable-shared
+LIBTOOL += --tag=disable-shared
 endif
 
 #
@@ -291,6 +290,7 @@
 #
 ifndef VERBOSE
 VERB := @
+LIBTOOL += --silent
 endif
 
 ###########################################################################
@@ -328,7 +328,6 @@
 # Allow gnu extensions...
 CPPFLAGS += -D_GNU_SOURCE
 
-# -Wno-unused-parameter
 CompileCommonOpts := -Wall -W  -Wwrite-strings -Wno-unused -I$(LEVEL)/include
 CompileOptimizeOpts := -O3 -DNDEBUG -finline-functions -fshort-enums
 
@@ -356,11 +355,7 @@
 # Link final executable
 #	(Note that we always link with the C++ compiler).
 #
-ifdef ENABLE_PURIFY # To enable purify, build with 'gmake ENABLE_PURIFY=1'
-Link     := $(PURIFY) $(LIBTOOL) --mode=link $(CXX) -static
-else
 Link     := $(LIBTOOL) --mode=link $(CXX)
-endif
 
 # link both projlib and llvmlib libraries
 LinkG    := $(Link) -g -L$(PROJLIBDEBUGSOURCE)  -L$(LLVMLIBDEBUGSOURCE) $(STRIP)
@@ -368,26 +363,20 @@
 LinkP    := $(Link) -O3 -L$(PROJLIBPROFILESOURCE) -L$(LLVMLIBPROFILESOURCE) $(PROFILE)
 
 # Create one .o file from a bunch of .o files...
-#ifdef SHARED_LIBRARY
-Relink = ${LIBTOOL} --mode=link $(CXX)
-#else
-Relink = ${LIBTOOL} --mode=link $(CXX) -only-static
-#endif
-
-# MakeSO - Create a .so file from a .o files...
-#MakeSO   := $(LIBTOOL) --mode=link $(CXX) $(MakeSharedObjectOption)
-#MakeSOO  := $(MakeSO) -O3
-#MakeSOP  := $(MakeSOO) $(PROFILE)
+Relink := ${LIBTOOL} --mode=link $(CXX)
+ifndef SHARED_LIBRARY
+Relink += -only-static
+endif
 
 #
 # Configure where the item being compiled should go.
 #
 ifdef SHARED_LIBRARY
-Link := $(Link) -rpath $(DESTLIBCURRENT)
+Link += -rpath $(DESTLIBCURRENT)
 endif
 
 ifdef TOOLNAME
-Link := $(Link) -rpath $(DESTTOOLCURRENT)
+Link += -rpath $(DESTTOOLCURRENT)
 endif
 
 # Create dependancy file from CPP file, send to stdout.




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 17:02:02 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 17:02:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Support/CommandLine.cpp
Message-ID: <200308142201.h7EM18i01771@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

CommandLine.cpp updated: 1.34 -> 1.35

---
Log message:

Add support for reading command line arguments from an environment variable.


---
Diffs of the changes:

Index: llvm/lib/Support/CommandLine.cpp
diff -u llvm/lib/Support/CommandLine.cpp:1.34 llvm/lib/Support/CommandLine.cpp:1.35
--- llvm/lib/Support/CommandLine.cpp:1.34	Wed Jul 30 12:34:02 2003
+++ llvm/lib/Support/CommandLine.cpp	Thu Aug 14 17:00:58 2003
@@ -152,6 +152,80 @@
          O->getNumOccurrencesFlag() == cl::OneOrMore;
 }
 
+/// ParseStringVector - Break INPUT up wherever one or more characters
+/// from DELIMS are found, and store the resulting tokens in OUTPUT.
+///
+static void ParseStringVector (std::vector<std::string> &output,
+			       std::string &input, const char *delims) {
+  std::string work (input);
+  int pos = work.find_first_not_of (delims);
+  if (pos == -1) return;
+  work = work.substr (pos);
+  pos = work.find_first_of (delims);
+  while (!work.empty() && pos != -1) {
+    if (pos == -1) break;
+    output.push_back (work.substr (0,pos));
+    int nextpos = work.find_first_not_of (delims, pos + 1);
+    if (nextpos != -1) {
+      work = work.substr (work.find_first_not_of (delims, pos + 1));
+      pos = work.find_first_of (delims);
+    } else {
+      work = "";
+      pos = -1;
+    }
+  }
+  if (!work.empty ()) {
+    output.push_back (work);
+  }
+}
+
+/// ParseCStringVector - Same effect as ParseStringVector, but the
+/// resulting output vector contains dynamically-allocated pointers to
+/// char, instead of standard C++ strings.
+///
+static void ParseCStringVector (std::vector<char *> &output,
+				std::string &input, const char *delims) {
+  std::vector<std::string> work;
+  ParseStringVector (work, input, delims);
+  for (std::vector<std::string>::iterator i = work.begin(), e = work.end();
+       i != e; ++i) {
+    output.push_back (strdup (i->c_str ()));
+  }
+}
+
+/// ParseEnvironmentOptions - An alternative entry point to the
+/// CommandLine library, which allows you to read the program's name
+/// from the caller (as PROGNAME) and its command-line arguments from
+/// an environment variable (whose name is given in ENVVAR).
+///
+void cl::ParseEnvironmentOptions (char *progName, char *envvar,
+				  const char *Overview) {
+  // Get program's "name", which we wouldn't know without the caller
+  // telling us.
+  assert (progName && "Program name not specified");
+  static std::vector<char *> newargv; // Maybe making it "static" is a hack.
+  int newargc;
+  newargv.push_back (progName);
+
+  // Get the environment variable they want us to parse options out of.
+  assert (envvar && "Environment variable name missing");  
+  char *envvalue = getenv (envvar);
+  if (envvalue == NULL) {
+    // Env var not set --> act like there are no more command line
+    // arguments.
+    newargc = newargv.size ();
+    ParseCommandLineOptions (newargc, &newargv[0], Overview);
+    return;
+  }
+  std::string envvaluestr (envvalue);
+
+  // Parse the value of the environment variable into a "command line"
+  // and hand it off to ParseCommandLineOptions().
+  ParseCStringVector (newargv, envvaluestr, " \v\f\t\r\n");
+  newargc = newargv.size ();
+  ParseCommandLineOptions (newargc, &newargv[0], Overview);
+}
+
 void cl::ParseCommandLineOptions(int &argc, char **argv,
                                  const char *Overview) {
   assert((!getOpts().empty() || !getPositionalOpts().empty()) &&




From gaeke at niobe.cs.uiuc.edu  Thu Aug 14 17:02:08 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Thu Aug 14 17:02:08 2003
Subject: [llvm-commits] CVS: llvm/include/Support/CommandLine.h
Message-ID: <200308142201.h7EM19s01779@niobe.cs.uiuc.edu>


Changes in directory llvm/include/Support:

CommandLine.h updated: 1.20 -> 1.21

---
Log message:

Add support for reading command line arguments from an environment variable.


---
Diffs of the changes:

Index: llvm/include/Support/CommandLine.h
diff -u llvm/include/Support/CommandLine.h:1.20 llvm/include/Support/CommandLine.h:1.21
--- llvm/include/Support/CommandLine.h:1.20	Fri Jul 25 12:23:27 2003
+++ llvm/include/Support/CommandLine.h	Thu Aug 14 17:00:59 2003
@@ -32,6 +32,13 @@
 				 const char *Overview = 0);
 
 //===----------------------------------------------------------------------===//
+// ParseEnvironmentOptions - Environment variable option processing alternate
+//                           entry point.
+//
+void cl::ParseEnvironmentOptions (char *progName, char *envvar,
+				  const char *Overview = 0);
+
+//===----------------------------------------------------------------------===//
 // Flags permitted to be passed to command line arguments
 //
 




From lattner at cs.uiuc.edu  Thu Aug 14 17:05:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 17:05:01 2003
Subject: [llvm-commits] CVS: llvm/include/Support/CommandLine.h
Message-ID: <200308142204.RAA24879@apoc.cs.uiuc.edu>


Changes in directory llvm/include/Support:

CommandLine.h updated: 1.21 -> 1.22

---
Log message:

Remove extraneous cl:: namespace qualifiers


---
Diffs of the changes:

Index: llvm/include/Support/CommandLine.h
diff -u llvm/include/Support/CommandLine.h:1.21 llvm/include/Support/CommandLine.h:1.22
--- llvm/include/Support/CommandLine.h:1.21	Thu Aug 14 17:00:59 2003
+++ llvm/include/Support/CommandLine.h	Thu Aug 14 17:04:41 2003
@@ -28,15 +28,15 @@
 //===----------------------------------------------------------------------===//
 // ParseCommandLineOptions - Command line option processing entry point.
 //
-void cl::ParseCommandLineOptions(int &argc, char **argv,
-				 const char *Overview = 0);
+void ParseCommandLineOptions(int &argc, char **argv,
+                             const char *Overview = 0);
 
 //===----------------------------------------------------------------------===//
 // ParseEnvironmentOptions - Environment variable option processing alternate
 //                           entry point.
 //
-void cl::ParseEnvironmentOptions (char *progName, char *envvar,
-				  const char *Overview = 0);
+void ParseEnvironmentOptions(char *progName, char *envvar,
+                             const char *Overview = 0);
 
 //===----------------------------------------------------------------------===//
 // Flags permitted to be passed to command line arguments




From brukman at cs.uiuc.edu  Thu Aug 14 19:28:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Aug 14 19:28:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
Message-ID: <200308150027.TAA07085@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcV9CodeEmitter.cpp updated: 1.27 -> 1.28

---
Log message:

* Must save FP registers when calling CompilationCallback(), because FP
  registers are global, are NOT windowed, and hence can be clobbered!
* Removed unused register shorthand notations
* Fixed and cleaned up comments in inline assembly


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.27 llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.28
--- llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.27	Thu Aug 14 01:04:59 2003
+++ llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp	Thu Aug 14 19:26:50 2003
@@ -75,7 +75,8 @@
 
   private:
     uint64_t emitStubForFunction(Function *F);
-    static void CompilationCallback();
+    static void SaveRestoreRegisters();
+    static uint64_t CompilationCallback();
     uint64_t resolveFunctionReference(uint64_t RetAddr);
 
   };
@@ -91,7 +92,7 @@
 ///
 uint64_t JITResolver::addFunctionReference(uint64_t Address, Function *F) {
   LazyCodeGenMap[Address] = F;
-  return (intptr_t)&JITResolver::CompilationCallback;
+  return (intptr_t)&JITResolver::SaveRestoreRegisters;
 }
 
 /// deleteFunctionReference - If we are emitting a far call, we already added a
@@ -126,8 +127,7 @@
 
 uint64_t JITResolver::insertFarJumpAtAddr(int64_t Target, uint64_t Addr) {
 
-  static const unsigned i1 = SparcIntRegClass::i1, i2 = SparcIntRegClass::i2,
-    i7 = SparcIntRegClass::i7,
+  static const unsigned 
     o6 = SparcIntRegClass::o6, g0 = SparcIntRegClass::g0,
     g1 = SparcIntRegClass::g1, g5 = SparcIntRegClass::g5;
 
@@ -143,7 +143,7 @@
     BuildMI(V9::SLLXi6, 3).addReg(g5).addSImm(32).addReg(g5),
     // sethi %hi(Target), %g1      ;; extract bits 10-31 into the dest reg
     BuildMI(V9::SETHI, 2).addSImm((Target >> 10) & 0x03fffff).addReg(g1),
-    // or %g5, %g1, %g1            ;; get upper word (in %i1) into %g1
+    // or %g5, %g1, %g1            ;; get upper word (in %g5) into %g1
     BuildMI(V9::ORr, 3).addReg(g5).addReg(g1).addReg(g1),
     // or %g1, %lo(Target), %g1    ;; get lowest 10 bits of Target into %g1
     BuildMI(V9::ORi, 3).addReg(g1).addSImm(Target & 0x03ff).addReg(g1),
@@ -162,12 +162,159 @@
   return Addr;
 }
 
-void JITResolver::CompilationCallback() {
-  uint64_t CameFrom = (uint64_t)(intptr_t)__builtin_return_address(0);
+void JITResolver::SaveRestoreRegisters() {
+  uint32_t SingleFP[32];
+  uint64_t DoubleFP[16];
+  // FIXME: uint128_t QuadFloatRegs[..];
+  uint64_t CCR, FSR, FPRS, g1, g5;
+
+#if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
+  __asm__ __volatile__ (// Save g1 and g5
+                        "stx %%g1, %0;\n\t" "stx %%g5, %1;\n\t"
+                        : "=m"(g1), "=m"(g5));
+
+  __asm__ __volatile__ (// Save condition-code registers
+                        "stx %%fsr, %0;\n\t" 
+                        "rd %%fprs, %1;\n\t" 
+                        "rd %%ccr,  %2;\n\t"
+                        : "=m"(FSR), "=r"(FPRS), "=r"(CCR));
+
+  // GCC says: `asm' only allows up to thirty parameters!
+  __asm__ __volatile__ (// Save Single FP registers, part 1
+                        "st  %%f0,  %0;\n\t"  "st  %%f1,  %1;\n\t"
+                        "st  %%f2,  %2;\n\t"  "st  %%f3,  %3;\n\t"
+                        "st  %%f4,  %4;\n\t"  "st  %%f5,  %5;\n\t"
+                        "st  %%f6,  %6;\n\t"  "st  %%f7,  %7;\n\t"
+                        "st  %%f8,  %8;\n\t"  "st  %%f9,  %9;\n\t"
+                        "st  %%f10, %10;\n\t" "st  %%f11, %11;\n\t"
+                        "st  %%f12, %12;\n\t" "st  %%f13, %13;\n\t"
+                        "st  %%f14, %14;\n\t" "st  %%f15, %15;\n\t"
+                        : "=m"(SingleFP[ 0]), "=m"(SingleFP[ 1]),
+                          "=m"(SingleFP[ 2]), "=m"(SingleFP[ 3]),
+                          "=m"(SingleFP[ 4]), "=m"(SingleFP[ 5]),
+                          "=m"(SingleFP[ 6]), "=m"(SingleFP[ 7]),
+                          "=m"(SingleFP[ 8]), "=m"(SingleFP[ 9]),
+                          "=m"(SingleFP[10]), "=m"(SingleFP[11]),
+                          "=m"(SingleFP[12]), "=m"(SingleFP[13]),
+                          "=m"(SingleFP[14]), "=m"(SingleFP[15]));
+                        
+  __asm__ __volatile__ (// Save Single FP registers, part 2
+                        "st  %%f16, %0;\n\t"  "st  %%f17, %1;\n\t"
+                        "st  %%f18, %2;\n\t"  "st  %%f19, %3;\n\t"
+                        "st  %%f20, %4;\n\t"  "st  %%f21, %5;\n\t"
+                        "st  %%f22, %6;\n\t"  "st  %%f23, %7;\n\t"
+                        "st  %%f24, %8;\n\t"  "st  %%f25, %9;\n\t"
+                        "st  %%f26, %10;\n\t" "st  %%f27, %11;\n\t"
+                        "st  %%f28, %12;\n\t" "st  %%f29, %13;\n\t"
+                        "st  %%f30, %14;\n\t" "st  %%f31, %15;\n\t"
+                        : "=m"(SingleFP[16]), "=m"(SingleFP[17]),
+                          "=m"(SingleFP[18]), "=m"(SingleFP[19]),
+                          "=m"(SingleFP[20]), "=m"(SingleFP[21]),
+                          "=m"(SingleFP[22]), "=m"(SingleFP[23]),
+                          "=m"(SingleFP[24]), "=m"(SingleFP[25]),
+                          "=m"(SingleFP[26]), "=m"(SingleFP[27]),
+                          "=m"(SingleFP[28]), "=m"(SingleFP[29]),
+                          "=m"(SingleFP[30]), "=m"(SingleFP[31]));
+
+  __asm__ __volatile__ (// Save Double FP registers
+                        "std %%f32, %0;\n\t"  "std %%f34, %1;\n\t"
+                        "std %%f32, %0;\n\t"  "std %%f34, %1;\n\t"
+                        "std %%f40, %4;\n\t"  "std %%f42, %5;\n\t"
+                        "std %%f44, %6;\n\t"  "std %%f46, %7;\n\t"
+                        "std %%f48, %8;\n\t"  "std %%f50, %9;\n\t"
+                        "std %%f52, %10;\n\t" "std %%f54, %11;\n\t"
+                        "std %%f56, %12;\n\t" "std %%f58, %13;\n\t"
+                        "std %%f60, %14;\n\t" "std %%f62, %15;\n\t"
+                        : "=m"(DoubleFP[32/2-16]), "=m"(DoubleFP[34/2-16]),
+                          "=m"(DoubleFP[36/2-16]), "=m"(DoubleFP[38/2-16]),
+                          "=m"(DoubleFP[40/2-16]), "=m"(DoubleFP[42/2-16]),
+                          "=m"(DoubleFP[44/2-16]), "=m"(DoubleFP[46/2-16]),
+                          "=m"(DoubleFP[48/2-16]), "=m"(DoubleFP[50/2-16]),
+                          "=m"(DoubleFP[52/2-16]), "=m"(DoubleFP[54/2-16]),
+                          "=m"(DoubleFP[56/2-16]), "=m"(DoubleFP[58/2-16]),
+                          "=m"(DoubleFP[60/2-16]), "=m"(DoubleFP[62/2-16]));
+#endif
+
+  // Resolve the function call
+  register uint64_t restoreAddr = CompilationCallback();
+
+#if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
+  // Set the return address to re-execute the `restore' instruction
+  __asm__ __volatile__ ("or %%o0, %%g0, %%i7;\n\t"
+
+                        // Restore g1 and g5
+                        "ldx %0, %%g1;\n\t" "ldx %1, %%g5;\n\t"
+                        :: "m"(g1), "m"(g5));
+
+  __asm__ __volatile__ (// Restore condition-code registers
+                        "ldx %0,    %%fsr;\n\t" 
+                        "wr  %1, 0, %%fprs;\n\t"
+                        "wr  %2, 0, %%ccr;\n\t" 
+                        :: "m"(FSR), "r"(FPRS), "r"(CCR));
+
+  // GCC says: `asm' only allows up to thirty parameters!
+  __asm__ __volatile__ (// Restore Single FP registers, part 1
+                        "ld  %0, %%f0;\n\t"   "ld  %1, %%f1;\n\t" 
+                        "ld  %2, %%f2;\n\t"   "ld  %3, %%f3;\n\t" 
+                        "ld  %4, %%f4;\n\t"   "ld  %5, %%f5;\n\t" 
+                        "ld  %6, %%f6;\n\t"   "ld  %7, %%f7;\n\t" 
+                        "ld  %8, %%f8;\n\t"   "ld  %9, %%f9;\n\t" 
+                        "ld  %10, %%f10;\n\t" "ld  %11, %%f11;\n\t"
+                        "ld  %12, %%f12;\n\t" "ld  %13, %%f13;\n\t"
+                        "ld  %14, %%f14;\n\t" "ld  %15, %%f15;\n\t"
+                        :: "m"(SingleFP[0]), "m"(SingleFP[1]),
+                           "m"(SingleFP[2]), "m"(SingleFP[3]),
+                           "m"(SingleFP[4]), "m"(SingleFP[5]),
+                           "m"(SingleFP[6]), "m"(SingleFP[7]),
+                           "m"(SingleFP[8]), "m"(SingleFP[9]),
+                           "m"(SingleFP[10]), "m"(SingleFP[11]),
+                           "m"(SingleFP[12]), "m"(SingleFP[13]),
+                           "m"(SingleFP[14]), "m"(SingleFP[15]));
+
+  __asm__ __volatile__ (// Restore Single FP registers, part 2
+                        "ld  %0, %%f16;\n\t"  "ld  %1, %%f17;\n\t"
+                        "ld  %2, %%f18;\n\t"  "ld  %3, %%f19;\n\t"
+                        "ld  %4, %%f20;\n\t"  "ld  %5, %%f21;\n\t"
+                        "ld  %6, %%f22;\n\t"  "ld  %7, %%f23;\n\t"
+                        "ld  %8, %%f24;\n\t"  "ld  %9, %%f25;\n\t"
+                        "ld  %10, %%f26;\n\t" "ld  %11, %%f27;\n\t"
+                        "ld  %12, %%f28;\n\t" "ld  %13, %%f29;\n\t"
+                        "ld  %14, %%f30;\n\t" "ld  %15, %%f31;\n\t"
+                        :: "m"(SingleFP[16]), "m"(SingleFP[17]),
+                           "m"(SingleFP[18]), "m"(SingleFP[19]),
+                           "m"(SingleFP[20]), "m"(SingleFP[21]),
+                           "m"(SingleFP[22]), "m"(SingleFP[23]),
+                           "m"(SingleFP[24]), "m"(SingleFP[25]),
+                           "m"(SingleFP[26]), "m"(SingleFP[27]),
+                           "m"(SingleFP[28]), "m"(SingleFP[29]),
+                           "m"(SingleFP[30]), "m"(SingleFP[31]));
+
+  __asm__ __volatile__ (// Restore Double FP registers
+                        "ldd %0, %%f32;\n\t"  "ldd %1, %%f34;\n\t"
+                        "ldd %2, %%f36;\n\t"  "ldd %3, %%f38;\n\t"
+                        "ldd %4, %%f40;\n\t"  "ldd %5, %%f42;\n\t"
+                        "ldd %6, %%f44;\n\t"  "ldd %7, %%f46;\n\t"
+                        "ldd %8, %%f48;\n\t"  "ldd %9, %%f50;\n\t"
+                        "ldd %10, %%f52;\n\t" "ldd %11, %%f54;\n\t"
+                        "ldd %12, %%f56;\n\t" "ldd %13, %%f58;\n\t"
+                        "ldd %14, %%f60;\n\t" "ldd %15, %%f62;\n\t"
+                        :: "m"(DoubleFP[32/2-16]), "m"(DoubleFP[34/2-16]),
+                           "m"(DoubleFP[36/2-16]), "m"(DoubleFP[38/2-16]),
+                           "m"(DoubleFP[40/2-16]), "m"(DoubleFP[42/2-16]),
+                           "m"(DoubleFP[44/2-16]), "m"(DoubleFP[46/2-16]),
+                           "m"(DoubleFP[48/2-16]), "m"(DoubleFP[50/2-16]),
+                           "m"(DoubleFP[52/2-16]), "m"(DoubleFP[54/2-16]),
+                           "m"(DoubleFP[56/2-16]), "m"(DoubleFP[58/2-16]),
+                           "m"(DoubleFP[60/2-16]), "m"(DoubleFP[62/2-16]));
+#endif
+}
+
+uint64_t JITResolver::CompilationCallback() {
+  uint64_t CameFrom = (uint64_t)(intptr_t)__builtin_return_address(1);
   int64_t Target = (int64_t)TheJITResolver->resolveFunctionReference(CameFrom);
   DEBUG(std::cerr << "In callback! Addr=0x" << std::hex << CameFrom << "\n");
+  register int64_t returnAddr = 0;
 #if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
-  register int64_t returnAddr;
   __asm__ __volatile__ ("add %%i7, %%g0, %0" : "=r" (returnAddr) : );
   DEBUG(std::cerr << "Read i7 (return addr) = "
                   << std::hex << returnAddr << ", value: "
@@ -181,7 +328,7 @@
 
   // Subtract enough to overwrite up to the 'save' instruction
   // This depends on whether we made a short call (1 instruction) or the
-  // farCall (long form: 10 instructions, short form: 7 instructions)
+  // farCall (7 instructions)
   uint64_t Offset = (LazyCallFlavor[CameFrom] == ShortCall) ? 4 : 28;
   uint64_t CodeBegin = CameFrom - Offset;
   
@@ -210,14 +357,13 @@
   delete MI;
 #endif
 
-  // Change the return address to reexecute the restore, then the jump
-  // The return address is really %o7, but will disappear after this function
-  // returns, and the register windows are rotated away.
-#if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
-  __asm__ __volatile__ ("sub %%i7, %0, %%i7" : : "r" (Offset+12));
-  DEBUG(std::cerr << "Callback setting return addr to "
+  // Change the return address to reexecute the restore, then the jump However,
+  // we can't just modify %i7 here, because we return to the function that will
+  // restore the floating-point registers for us. Thus, we just return the value
+  // we want it to be, and the parent will take care of setting %i7 correctly.
+  DEBUG(std::cerr << "Callback returning the addr of restore inst: "
                   << std::hex << (CameFrom-Offset-12) << "\n");
-#endif
+  return CameFrom - Offset - 12; // 8 because of call+delay, 4 more to restore
 }
 
 /// emitStubForFunction - This method is used by the JIT when it needs to emit
@@ -295,7 +441,7 @@
 
 unsigned 
 SparcV9CodeEmitter::getRealRegNum(unsigned fakeReg,
-                                         MachineInstr &MI) {
+                                  MachineInstr &MI) {
   const TargetRegInfo &RI = TM.getRegInfo();
   unsigned regClass, regType = RI.getRegType(fakeReg);
   // At least map fakeReg into its class
@@ -359,8 +505,7 @@
 // WARNING: if the call used the delay slot to do meaningful work, that's not
 // being accounted for, and the behavior will be incorrect!!
 inline void SparcV9CodeEmitter::emitFarCall(uint64_t Target, Function *F) {
-  static const unsigned i1 = SparcIntRegClass::i1, i2 = SparcIntRegClass::i2,
-      i7 = SparcIntRegClass::i7, o6 = SparcIntRegClass::o6,
+  static const unsigned o6 = SparcIntRegClass::o6,
       o7 = SparcIntRegClass::o7, g0 = SparcIntRegClass::g0,
       g1 = SparcIntRegClass::g1, g5 = SparcIntRegClass::g5;
 
@@ -372,17 +517,17 @@
     BuildMI(V9::SETHI, 2).addSImm(Target >> 42).addReg(g5),
     // or %g5, %ulo(Target), %g5 ;; get 10 lower bits of upper word into %1
     BuildMI(V9::ORi, 3).addReg(g5).addSImm((Target >> 32) & 0x03ff).addReg(g5),
-    // sllx %g5, 32, %g5            ;; shift those 10 bits to the upper word
+    // sllx %g5, 32, %g5         ;; shift those 10 bits to the upper word
     BuildMI(V9::SLLXi6, 3).addReg(g5).addSImm(32).addReg(g5),
     // sethi %hi(Target), %g1    ;; extract bits 10-31 into the dest reg
     BuildMI(V9::SETHI, 2).addSImm((Target >> 10) & 0x03fffff).addReg(g1),
-    // or %g5, %g1, %g1             ;; get upper word (in %g5) into %g1
+    // or %g5, %g1, %g1          ;; get upper word (in %g5) into %g1
     BuildMI(V9::ORr, 3).addReg(g5).addReg(g1).addReg(g1),
     // or %g1, %lo(Target), %g1  ;; get lowest 10 bits of Target into %g1
     BuildMI(V9::ORi, 3).addReg(g1).addSImm(Target & 0x03ff).addReg(g1),
-    // jmpl %g1, %g0, %o7          ;; indirect call on %g1
+    // jmpl %g1, %g0, %o7        ;; indirect call on %g1
     BuildMI(V9::JMPLRETr, 3).addReg(g1).addReg(g0).addReg(o7),
-    // nop                         ;; delay slot
+    // nop                       ;; delay slot
     BuildMI(V9::NOP, 0)
   };
 
@@ -672,6 +817,5 @@
     return (void*)(intptr_t)MCE.getGlobalValueAddress(V);
   }
 }
-
 
 #include "SparcV9CodeEmitter.inc"




From brukman at cs.uiuc.edu  Thu Aug 14 19:30:00 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Thu Aug 14 19:30:00 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.Makefile TEST.nightly.report
Message-ID: <200308150029.TAA07112@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.21 -> 1.22
TEST.nightly.report updated: 1.8 -> 1.9

---
Log message:

TEST.nightly.Makefile:
* Make LLC case consistent with CBE and JIT
* Remove useless entry for CBE (it's not used in the report)

TEST.nightly.report:
* Fix spelling
* Fix regex for LLC so that we get the correct times


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.21 llvm/test/Programs/TEST.nightly.Makefile:1.22
--- llvm/test/Programs/TEST.nightly.Makefile:1.21	Thu Aug 14 11:39:10 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Thu Aug 14 19:29:17 2003
@@ -58,9 +58,6 @@
 	  printf "TEST-RESULT-llc-time: " >> $@;\
 	  grep "^real" $@ >> $@;\
 	  echo >> $@;\
-	  printf "TEST-RESULT-llc-comptime: " >> $@;\
-	  grep "Total Execution Time" $@.info >> $@;\
-	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: llc $(RELDIR)/$*" >> $@;\
 	fi
@@ -73,7 +70,6 @@
 	-head -n 100 Output/$*.exe-cbe >> $@
 	@-if test -f Output/$*.exe-cbe; then \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
-	  echo "TEST-RESULT-cbe: YES" >> $@;\
 	  printf "TEST-RESULT-cbe-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)cbe.time >> $@;\
 	  echo >> $@;\


Index: llvm/test/Programs/TEST.nightly.report
diff -u llvm/test/Programs/TEST.nightly.report:1.8 llvm/test/Programs/TEST.nightly.report:1.9
--- llvm/test/Programs/TEST.nightly.report:1.8	Thu Jun 26 15:26:25 2003
+++ llvm/test/Programs/TEST.nightly.report	Thu Aug 14 19:29:17 2003
@@ -11,7 +11,7 @@
 
 # These are the columns for the report.  The first entry is the header for the
 # column, the second is the regex to use to match the value.  Empty list create
-# seperators, and closures may be put in for custom processing.
+# separators, and closures may be put in for custom processing.
 (
 # Name
  ["Program"  , '\'([^\']+)\' Program'],
@@ -20,7 +20,7 @@
  ["GCCAS"    , "TEST-RESULT-compile: $WallTimeRE"],
  ["Bytecode" , 'TEST-RESULT-compile: *([0-9]+)'],
  ["Instrs"   , 'TEST-RESULT-compile: *([0-9]+).*Number of inst'],
- ["LLC"      , "TEST-RESULT-llc: $WallTimeRE"],
+ ["LLC"      , 'TEST-RESULT-llc-time: real\s*([.0-9m]+)'],
  [],
  ["NAT"      , 'TEST-RESULT-nat-time: real\s*([.0-9m]+)'],
  ["CBE"      , 'TEST-RESULT-cbe-time: real\s*([.0-9m]+)'],




From lattner at cs.uiuc.edu  Thu Aug 14 21:19:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:19:01 2003
Subject: [llvm-commits] CVS: llvm/Makefile.common
Message-ID: <200308150218.VAA30839@apoc.cs.uiuc.edu>


Changes in directory llvm:

Makefile.common updated: 1.111 -> 1.112

---
Log message:

Implement BYTECODE_LIBRARY support


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.111 llvm/Makefile.common:1.112
--- llvm/Makefile.common:1.111	Thu Aug 14 16:10:25 2003
+++ llvm/Makefile.common	Thu Aug 14 21:18:35 2003
@@ -119,14 +119,14 @@
 # It is typically the root directory of what we're compiling now.
 #
 ifndef LLVM_SRC_ROOT
-LLVM_SRC_ROOT = $(BUILD_SRC_ROOT)
+LLVM_SRC_ROOT := $(BUILD_SRC_ROOT)
 endif
 
 #
 # Set the LLVM object directory.
 #
 ifndef LLVM_OBJ_ROOT
-LLVM_OBJ_ROOT = $(BUILD_OBJ_ROOT)
+LLVM_OBJ_ROOT := $(BUILD_OBJ_ROOT)
 endif
 
 ###########################################################################
@@ -143,6 +143,7 @@
 ifdef BYTECODE_LIBRARY
 # if BYTECODE_LIBRARY is specified, the default is to build the bytecode lib
 all:: bytecodelib
+install:: bytecodelib-install
 endif
 
 # Default Rule:  Make sure it's also a :: rule
@@ -172,7 +173,8 @@
 # slightly since GNU Make will not try to find implicit rules for targets
 # which are marked as Phony.
 #
-.PHONY: all dynamic bytecodelib clean distclean install test bytecode prdirs
+.PHONY: all dynamic bytecodelib bytecodelib-install
+.PHONY: clean distclean install test bytecode prdirs
 
 ###########################################################################
 # Miscellaneous paths and commands:
@@ -227,6 +229,7 @@
 DESTLIBDEBUG    := $(BUILD_OBJ_ROOT)/lib/Debug
 DESTLIBRELEASE  := $(BUILD_OBJ_ROOT)/lib/Release
 DESTLIBPROFILE  := $(BUILD_OBJ_ROOT)/lib/Profile
+DESTLIBBYTECODE := $(BUILD_OBJ_ROOT)/lib/Bytecode
 DESTLIBCURRENT  := $(BUILD_OBJ_ROOT)/lib/$(CONFIGURATION)
 
 # LLVM libraries used for linking
@@ -300,14 +303,26 @@
 ###########################################################################
 
 #--------------------------------------------------------------------------
-# Special tools used while building the LLVM tree.  Burg is built as part
-# of the utils directory.
-#--------------------------------------------------------------------------
+# Utilities used while building the LLVM tree, which live in the utils dir
+#
 BURG    := $(LLVMTOOLCURRENT)/burg
 RunBurg := $(BURG) $(BURG_OPTS)
-
 TBLGEN  := $(LLVMTOOLCURRENT)/tblgen
 
+#--------------------------------------------------------------------------
+# The LLVM GCC front-end in C and C++ flavors
+#
+LLVMGCC := $(LLVMGCCDIR)/bin/gcc
+LCC1    := $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1
+LLVMGXX := $(LLVMGCCDIR)/bin/g++
+LCC1XX  := $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1plus
+
+#--------------------------------------------------------------------------
+# Some of the compiled LLVM tools which are used for compilation of runtime
+# libraries.
+#
+LLVMAS  := $(LLVMTOOLCURRENT)/as
+
 
 ###########################################################################
 # Compile Time Flags
@@ -399,10 +414,12 @@
 #
 # Libtool Objects
 #
-Objs := $(sort $(patsubst Debug/%.lo, %.lo, $(addsuffix .lo,$(notdir $(basename $(Source))))))
+Srcs := $(sort $(notdir $(basename $(Source))))
+Objs := $(addsuffix .lo, $(Srcs))
 ObjectsO := $(addprefix $(BUILD_OBJ_DIR)/Release/,$(Objs))
 ObjectsP := $(addprefix $(BUILD_OBJ_DIR)/Profile/,$(Objs))
 ObjectsG := $(addprefix $(BUILD_OBJ_DIR)/Debug/,$(Objs))
+ObjectsBC := $(addprefix $(BUILD_OBJ_DIR)/Bytecode/,$(addsuffix .bc, $(Srcs)))
 
 #
 # The real objects underlying the libtool objects
@@ -481,6 +498,7 @@
 LIBNAME_OBJO := $(DESTLIBRELEASE)/$(LIBRARYNAME).o
 LIBNAME_OBJP := $(DESTLIBPROFILE)/$(LIBRARYNAME).o
 LIBNAME_OBJG := $(DESTLIBDEBUG)/$(LIBRARYNAME).o
+LIBNAME_BC   := $(DESTLIBBYTECODE)/lib$(LIBRARYNAME).bc
 
 #--------------------------------------------------------------------
 # Library Targets
@@ -489,6 +507,12 @@
 
 # dynamic target builds a shared object version of the library...
 dynamic:: $(DESTLIBCURRENT)/lib$(LIBRARYNAME).so
+bytecodelib:: $(LIBNAME_BC)
+bytecodelib-install:: $(LLVMGCCDIR)/bytecode-libs/lib$(LIBRARYNAME).bc
+
+$(LLVMGCCDIR)/bytecode-libs/lib$(LIBRARYNAME).bc: $(LIBNAME_BC)
+	@echo ======= Installing $(LIBRARYNAME) bytecode library =======
+	cp $< $@
 
 # Does the library want a .o version built?
 ifndef DONT_BUILD_RELINKED
@@ -504,6 +528,18 @@
 # Rules for building libraries
 #--------------------------------------------------------------------
 
+LinkBCLib := $(LLVMGCC) -shared
+ifdef EXPORTED_SYMBOL_LIST
+LinkBCLib += -Xlinker -internalize-public-api-list=$(EXPORTED_SYMBOL_LIST)
+else
+LinkBCLib += -Xlinker -disable-internalize
+endif
+
+
+# Rule for building bytecode libraries.
+$(LIBNAME_BC): $(ObjectsBC) $(LibSubDirs)
+	@echo ======= Linking $(LIBRARYNAME) bytecode library =======
+	$(VERB) $(LinkBCLib) -o $@ $(ObjectsBC) $(LibSubDirs) $(LibLinkOpts)
 #
 # Rules for building dynamically linked libraries.
 #
@@ -540,6 +576,7 @@
 	@$(RM) -f $@
 	$(VERB) $(Link) -g $(STRIP) -o $@ $(ObjectsG) $(LibSubDirs) -static
 
+
 #
 # Rules for building .o libraries.
 #
@@ -663,7 +700,7 @@
 
 
 #---------------------------------------------------------
-.PRECIOUS: $(BUILD_OBJ_DIR)/Depend/.dir
+.PRECIOUS: $(BUILD_OBJ_DIR)/Depend/.dir $(BUILD_OBJ_DIR)/Bytecode/.dir
 .PRECIOUS: $(BUILD_OBJ_DIR)/Debug/.dir $(BUILD_OBJ_DIR)/Release/.dir
 
 # Create .lo files in the ObjectFiles directory from the .cpp and .c files...
@@ -691,6 +728,19 @@
 	@echo "Compiling $<"
 	$(VERB) $(CompileCG) $< -o $@
 
+$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.cpp $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1XX)
+	@echo "Compiling $< to bytecode"
+	$(VERB) $(LLVMGXX) $(CPPFLAGS) -c $< -o $@
+
+$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.c $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1)
+	@echo "Compiling $< to bytecode"
+	$(VERB) $(LLVMGCC) $(CPPFLAGS) -c $< -o $@
+
+$(BUILD_OBJ_DIR)/Bytecode/%.bc: $(SourceDir)%.ll $(BUILD_OBJ_DIR)/Bytecode/.dir $(LCC1)
+	@echo "Compiling $< to bytecode"
+	$(VERB) $(LLVMAS) $< -f -o $@
+
+
 #
 # Rules for building lex/yacc files
 #
@@ -747,7 +797,9 @@
 
 # 'make clean' nukes the tree
 clean::
-	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend
+	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Debug $(BUILD_OBJ_DIR)/Release
+	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Profile $(BUILD_OBJ_DIR)/Depend
+	$(VERB) $(RM) -rf $(BUILD_OBJ_DIR)/Bytecode
 	$(VERB) $(RM) -f core core.[0-9][0-9]* *.o *.d *.so *~ *.flc
 	$(VERB) $(RM) -f $(LEX_OUTPUT) $(YACC_OUTPUT)
 




From lattner at cs.uiuc.edu  Thu Aug 14 21:20:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:20:02 2003
Subject: [llvm-commits] CVS: llvm/test/Makefile.tests
Message-ID: <200308150219.VAA30852@apoc.cs.uiuc.edu>


Changes in directory llvm/test:

Makefile.tests updated: 1.73 -> 1.74

---
Log message:

Some of this gets hoisted up to Makefile.common



---
Diffs of the changes:

Index: llvm/test/Makefile.tests
diff -u llvm/test/Makefile.tests:1.73 llvm/test/Makefile.tests:1.74
--- llvm/test/Makefile.tests:1.73	Thu Aug  7 00:36:53 2003
+++ llvm/test/Makefile.tests	Thu Aug 14 21:19:08 2003
@@ -36,13 +36,12 @@
 
 # LLVM Tool Definitions...
 #
-LCC      = $(LLVMGCCDIR)/bin/gcc
-LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1
-LCXX     = $(LLVMGCCDIR)/bin/g++
-LCC1XX   = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1plus
+LCC      = $(LLVMGCC)   ## FIXME: remove these definitions, use LLVMGCC directly
+LCXX     = $(LLVMGXX)   ## FIXME: remove these definitions, use LLVMGXX directly
+LAS      = $(LLVMAS)    ## FIXME: remove these definitions, use LLVMAS directly
+
 LLI      = $(TOOLS)/lli
 LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/as
 LGCCAS   = $(TOOLS)/gccas
 LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
 LGCCLDPROG = $(TOOLS)/gccld




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:00 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libm/Makefile
Message-ID: <200308150220.VAA30915@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libm:

Makefile updated: 1.1 -> 1.2

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style



---
Diffs of the changes:

Index: llvm/test/Libraries/libm/Makefile
diff -u llvm/test/Libraries/libm/Makefile:1.1 llvm/test/Libraries/libm/Makefile:1.2
--- llvm/test/Libraries/libm/Makefile:1.1	Fri Mar  8 17:20:45 2002
+++ llvm/test/Libraries/libm/Makefile	Thu Aug 14 21:20:23 2003
@@ -1,6 +1,7 @@
 LEVEL = ../../..
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=m
 
-LIBNAME = m
-
-include ../Makefile.libs
+include $(LEVEL)/Makefile.common
 




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:06 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:06 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libmalloc/Makefile
Message-ID: <200308150220.VAA30923@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libmalloc:

Makefile updated: 1.1 -> 1.2

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style


---
Diffs of the changes:

Index: llvm/test/Libraries/libmalloc/Makefile
diff -u llvm/test/Libraries/libmalloc/Makefile:1.1 llvm/test/Libraries/libmalloc/Makefile:1.2
--- llvm/test/Libraries/libmalloc/Makefile:1.1	Fri Mar  8 17:20:49 2002
+++ llvm/test/Libraries/libmalloc/Makefile	Thu Aug 14 21:20:28 2003
@@ -1,6 +1,6 @@
 LEVEL = ../../..
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=malloc
 
-LIBNAME = malloc
-
-include ../Makefile.libs
-
+include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:12 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:12 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/Makefile Makefile.libs
Message-ID: <200308150220.VAA30928@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries:

Makefile updated: 1.5 -> 1.6
Makefile.libs (r1.7) removed

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style


---
Diffs of the changes:

Index: llvm/test/Libraries/Makefile
diff -u llvm/test/Libraries/Makefile:1.5 llvm/test/Libraries/Makefile:1.6
--- llvm/test/Libraries/Makefile:1.5	Fri Mar 22 13:13:47 2002
+++ llvm/test/Libraries/Makefile	Thu Aug 14 21:20:00 2003
@@ -1,7 +1,7 @@
 # Libraries Makefile:  Build all subdirectories automatically
 
 LEVEL = ../..
-DIRS  := $(sort $(filter-out Output/, $(filter-out CVS/, $(wildcard */))))
+PARALLEL_DIRS  := $(sort $(filter-out Output/, $(filter-out CVS/, $(wildcard */))))
 
 include ${LEVEL}/Makefile.common
 




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:18 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:18 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libucb/Makefile
Message-ID: <200308150220.VAA30935@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libucb:

Makefile updated: 1.1 -> 1.2

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style



---
Diffs of the changes:

Index: llvm/test/Libraries/libucb/Makefile
diff -u llvm/test/Libraries/libucb/Makefile:1.1 llvm/test/Libraries/libucb/Makefile:1.2
--- llvm/test/Libraries/libucb/Makefile:1.1	Fri Mar  8 17:20:52 2002
+++ llvm/test/Libraries/libucb/Makefile	Thu Aug 14 21:20:32 2003
@@ -1,6 +1,6 @@
 LEVEL = ../../..
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=ucb
 
-LIBNAME = ucb
-
-include ../Makefile.libs
-
+include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:24 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:24 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/crtend/Makefile
Message-ID: <200308150220.VAA30940@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/crtend:

Makefile updated: 1.2 -> 1.3

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style



---
Diffs of the changes:

Index: llvm/test/Libraries/crtend/Makefile
diff -u llvm/test/Libraries/crtend/Makefile:1.2 llvm/test/Libraries/crtend/Makefile:1.3
--- llvm/test/Libraries/crtend/Makefile:1.2	Thu May 22 14:50:30 2003
+++ llvm/test/Libraries/crtend/Makefile	Thu Aug 14 21:20:03 2003
@@ -1,11 +1,17 @@
 LEVEL = ../../..
-LIBNAME = crtend
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=crtend
+
 Source = crtend.c listend.ll
 
 EXPORTED_SYMBOL_LIST = __main,llvm.global_ctors,llvm.global_dtors
 
-include ../Makefile.libs
+include $(LEVEL)/Makefile.common
+
+
+$(LLVMGCCDIR)/bytecode-libs/crtend.o: $(LIBNAME_BC)
+	@cp $< $@
 
-install:: $(DESTLIBNAME)
-	cp $(DESTLIBNAME) $(INSTALL_DIR)/crtend.o
-	rm $(INSTALL_DIR)/libcrtend.bc
+install:: $(LLVMGCCDIR)/bytecode-libs/crtend.o
+	@rm $(LLVMGCCDIR)/bytecode-libs/libcrtend.bc
\ No newline at end of file




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:30 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:30 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libc/Makefile
Message-ID: <200308150220.VAA30945@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libc:

Makefile updated: 1.1 -> 1.2

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style


---
Diffs of the changes:

Index: llvm/test/Libraries/libc/Makefile
diff -u llvm/test/Libraries/libc/Makefile:1.1 llvm/test/Libraries/libc/Makefile:1.2
--- llvm/test/Libraries/libc/Makefile:1.1	Fri Mar  8 17:20:38 2002
+++ llvm/test/Libraries/libc/Makefile	Thu Aug 14 21:20:06 2003
@@ -1,6 +1,7 @@
 LEVEL = ../../..
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=c
 
-LIBNAME = c
-
-include ../Makefile.libs
+include $(LEVEL)/Makefile.common
 




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:36 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:36 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libdummy/Makefile
Message-ID: <200308150220.VAA30950@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libdummy:

Makefile updated: 1.1 -> 1.2

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style



---
Diffs of the changes:

Index: llvm/test/Libraries/libdummy/Makefile
diff -u llvm/test/Libraries/libdummy/Makefile:1.1 llvm/test/Libraries/libdummy/Makefile:1.2
--- llvm/test/Libraries/libdummy/Makefile:1.1	Fri Jan 17 13:09:29 2003
+++ llvm/test/Libraries/libdummy/Makefile	Thu Aug 14 21:20:10 2003
@@ -1,4 +1,6 @@
 LEVEL = ../../..
-LIBNAME = dummy
-include ../Makefile.libs
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=dummy
 
+include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:42 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:42 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libdummy/dummylib.c
Message-ID: <200308150220.VAA30955@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libdummy:

dummylib.c updated: 1.5 -> 1.6

---
Log message:

Disable this library for now


---
Diffs of the changes:

Index: llvm/test/Libraries/libdummy/dummylib.c
diff -u llvm/test/Libraries/libdummy/dummylib.c:1.5 llvm/test/Libraries/libdummy/dummylib.c:1.6
--- llvm/test/Libraries/libdummy/dummylib.c:1.5	Tue Feb 18 14:42:07 2003
+++ llvm/test/Libraries/libdummy/dummylib.c	Thu Aug 14 21:19:43 2003
@@ -7,6 +7,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#if 0
 int stat(const char *file_name, struct stat *buf) { return 0; }
 int fstat(int filedes, struct stat *buf) { return 0; }
 int lstat(const char *file_name, struct stat *buf) { return 0; }
@@ -140,3 +141,4 @@
 int tolower(int x) { return x; }
 int toupper(int x) { return x; }
 
+#endif




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:48 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:48 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libg/Makefile
Message-ID: <200308150220.VAA30960@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libg:

Makefile updated: 1.1 -> 1.2

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style


---
Diffs of the changes:

Index: llvm/test/Libraries/libg/Makefile
diff -u llvm/test/Libraries/libg/Makefile:1.1 llvm/test/Libraries/libg/Makefile:1.2
--- llvm/test/Libraries/libg/Makefile:1.1	Wed Jul 31 11:14:53 2002
+++ llvm/test/Libraries/libg/Makefile	Thu Aug 14 21:20:13 2003
@@ -1,6 +1,6 @@
 LEVEL = ../../..
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=g
 
-LIBNAME = g
-
-include ../Makefile.libs
-
+include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Thu Aug 14 21:21:54 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:21:54 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libgcc/Makefile
Message-ID: <200308150220.VAA30965@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libgcc:

Makefile updated: 1.1 -> 1.2

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style



---
Diffs of the changes:

Index: llvm/test/Libraries/libgcc/Makefile
diff -u llvm/test/Libraries/libgcc/Makefile:1.1 llvm/test/Libraries/libgcc/Makefile:1.2
--- llvm/test/Libraries/libgcc/Makefile:1.1	Fri Mar  8 17:20:42 2002
+++ llvm/test/Libraries/libgcc/Makefile	Thu Aug 14 21:20:16 2003
@@ -1,6 +1,6 @@
 LEVEL = ../../..
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=gcc
 
-LIBNAME = gcc
-
-include ../Makefile.libs
-
+include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Thu Aug 14 21:22:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:22:00 2003
Subject: [llvm-commits] CVS: llvm/test/Libraries/libinstr/Makefile
Message-ID: <200308150220.VAA30970@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Libraries/libinstr:

Makefile updated: 1.4 -> 1.5

---
Log message:

Convert libraries into the BYTECODE_LIBRARY style


---
Diffs of the changes:

Index: llvm/test/Libraries/libinstr/Makefile
diff -u llvm/test/Libraries/libinstr/Makefile:1.4 llvm/test/Libraries/libinstr/Makefile:1.5
--- llvm/test/Libraries/libinstr/Makefile:1.4	Tue Jul  8 13:40:58 2003
+++ llvm/test/Libraries/libinstr/Makefile	Thu Aug 14 21:20:19 2003
@@ -1,23 +1,7 @@
 LEVEL = ../../..
+BYTECODE_LIBRARY=1
+#DONT_BUILD_RELINKED=1
+LIBRARYNAME=gcc
 
-LIBNAME = instr
+include $(LEVEL)/Makefile.common
 
-include ../Makefile.libs
-
-## We need the native libraries for libinstr because they are directly
-## linked into the native CBE or LLC code.  That is the only practical
-## way to debug them!
-
-LIBINSTR = ../Output/libinstr.$(ARCH).a
-all:: $(LIBINSTR)
-
-tracelib: tracelib.c
-	g++ -g -DTEST_INSTRLIB $< -o $@
-
-Debug/tracelib.o: tracelib.c Debug/.dir
-	$(CompileC) -g $< -o $@
-
-$(LIBINSTR): Debug/tracelib.o ../Output/.dir
-	ar r $@ $<
-
-tracelib.c: tracelib.h




From lattner at cs.uiuc.edu  Thu Aug 14 21:28:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:28:01 2003
Subject: [llvm-commits] CVS: llvm/runtime/Bytecode/
Message-ID: <200308150227.VAA31842@apoc.cs.uiuc.edu>


Changes in directory llvm/runtime/Bytecode:


---
Log message:

Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/runtime/Bytecode added to the repository


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Thu Aug 14 21:32:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:32:01 2003
Subject: [llvm-commits] CVS: llvm/runtime/README.txt
Message-ID: <200308150231.VAA32764@apoc.cs.uiuc.edu>


Changes in directory llvm/runtime:

README.txt updated: 1.1 -> 1.2

---
Log message:

Update readme


---
Diffs of the changes:

Index: llvm/runtime/README.txt
diff -u llvm/runtime/README.txt:1.1 llvm/runtime/README.txt:1.2
--- llvm/runtime/README.txt:1.1	Wed Nov  6 14:58:26 2002
+++ llvm/runtime/README.txt	Thu Aug 14 21:31:23 2003
@@ -1,25 +1,4 @@
-Date: Wed, 6 Nov 2002 14:05:32 -0600 (CST)
-From: Chris Lattner <sabre at nondot.org>
-To: LLVMdev List <llvmdev at cs.uiuc.edu>
-Subject: What is test/Libraries?
-
-Hey everyone,
-
-There has recently been some confusion over what test/Libraries is and
-what it is used for.  The short answer is: it's used when building GCC,
-not for tests, so you all shouldn't need to use it.
-
-test/Libraries contains the LLVM "system libraries", which are linked to
-programs when the linker is run with the appropriate -l switch (for
-example -lm links in the "math" library).  In general, these libraries are
-just stubbed out libraries, because noone has had the time to do a full
-glibc port to LLVM.
-
-Problems arise because the makefiles have a number of hardcoded paths in
-it that are used to copy files around and install the libraries, which
-cause problems if anyone (except for me) uses them.  I'm sorry a better
-system isn't in place yet for these libraries, but if you just ignore
-them, they won't cause you any harm.  :)
-
--Chris
-
+This directory contains the various runtime libraries used by components of 
+the LLVM compiler.  For example, the automatic pool allocation transformation
+inserts calls to an external pool allocator library.  This runtime library is
+an example of the type of library that lives in these directories.




From lattner at cs.uiuc.edu  Thu Aug 14 21:34:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:34:02 2003
Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/Makefile
Message-ID: <200308150233.VAA01347@apoc.cs.uiuc.edu>


Changes in directory llvm/runtime/GCCLibraries:

Makefile added (r1.1)

---
Log message:

Initial checkin of runtime/GCCLibraries makefile


---
Diffs of the changes:

Index: llvm/runtime/GCCLibraries/Makefile
diff -c /dev/null llvm/runtime/GCCLibraries/Makefile:1.1
*** /dev/null	Thu Aug 14 21:33:59 2003
--- llvm/runtime/GCCLibraries/Makefile	Thu Aug 14 21:33:49 2003
***************
*** 0 ****
--- 1,13 ----
+ # llvm/runtime/GCCLibraries Makefile:  Build all subdirectories automatically
+ 
+ LEVEL = ../..
+ PARALLEL_DIRS  := $(sort $(filter-out Output/, $(filter-out CVS/, $(wildcard */))))
+ 
+ include $(LEVEL)/Makefile.common
+ 
+ # Install target for libraries: Copy into the gcc install directory in chris's
+ # tree...
+ #
+ install::
+ 
+ clean::




From lattner at cs.uiuc.edu  Thu Aug 14 21:36:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:36:02 2003
Subject: [llvm-commits] CVS: llvm/runtime/GCCLibraries/README.txt
Message-ID: <200308150235.VAA01365@apoc.cs.uiuc.edu>


Changes in directory llvm/runtime/GCCLibraries:

README.txt added (r1.1)

---
Log message:

Initial checkin of README


---
Diffs of the changes:

Index: llvm/runtime/GCCLibraries/README.txt
diff -c /dev/null llvm/runtime/GCCLibraries/README.txt:1.1
*** /dev/null	Thu Aug 14 21:35:23 2003
--- llvm/runtime/GCCLibraries/README.txt	Thu Aug 14 21:35:13 2003
***************
*** 0 ****
--- 1,7 ----
+ This directory contains libraries which are used when building the GCC 
+ front-end.  For the most part, these are just stub libraries, but some 
+ of them contain actual code.
+ 
+ In particular, the crtend library contains the runtime code to handle
+ static constructors and destructors for C and C++ programs.
+ 




From lattner at cs.uiuc.edu  Thu Aug 14 21:39:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:39:01 2003
Subject: [llvm-commits] CVS: llvm/runtime/libdummy/README.txt Makefile
Message-ID: <200308150238.VAA01913@apoc.cs.uiuc.edu>


Changes in directory llvm/runtime/libdummy:

README.txt added (r1.1)
Makefile updated: 1.2 -> 1.3

---
Log message:

initial checkin, adjust LEVEL


---
Diffs of the changes:

Index: llvm/runtime/libdummy/README.txt
diff -c /dev/null llvm/runtime/libdummy/README.txt:1.1
*** /dev/null	Thu Aug 14 21:38:14 2003
--- llvm/runtime/libdummy/README.txt	Thu Aug 14 21:38:04 2003
***************
*** 0 ****
--- 1,2 ----
+ This directory contains stub routines which are occasionally useful when 
+ performing alias analysis research.


Index: llvm/runtime/libdummy/Makefile
diff -u llvm/runtime/libdummy/Makefile:1.2 llvm/runtime/libdummy/Makefile:1.3
--- llvm/runtime/libdummy/Makefile:1.2	Thu Aug 14 21:20:10 2003
+++ llvm/runtime/libdummy/Makefile	Thu Aug 14 21:38:04 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../..
+LEVEL = ../..
 BYTECODE_LIBRARY=1
 DONT_BUILD_RELINKED=1
 LIBRARYNAME=dummy




From lattner at cs.uiuc.edu  Thu Aug 14 21:39:08 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:39:08 2003
Subject: [llvm-commits] CVS: llvm/runtime/libtrace/README.txt Makefile
Message-ID: <200308150238.VAA01922@apoc.cs.uiuc.edu>


Changes in directory llvm/runtime/libtrace:

README.txt added (r1.1)
Makefile updated: 1.5 -> 1.6

---
Log message:

initial checkin, adjust LEVEL



---
Diffs of the changes:

Index: llvm/runtime/libtrace/README.txt
diff -c /dev/null llvm/runtime/libtrace/README.txt:1.1
*** /dev/null	Thu Aug 14 21:38:16 2003
--- llvm/runtime/libtrace/README.txt	Thu Aug 14 21:38:06 2003
***************
*** 0 ****
--- 1,2 ----
+ These routines form the support library for the LLVM -trace and -tracem 
+ instrumentation passes.


Index: llvm/runtime/libtrace/Makefile
diff -u llvm/runtime/libtrace/Makefile:1.5 llvm/runtime/libtrace/Makefile:1.6
--- llvm/runtime/libtrace/Makefile:1.5	Thu Aug 14 21:20:19 2003
+++ llvm/runtime/libtrace/Makefile	Thu Aug 14 21:38:06 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../..
+LEVEL = ../..
 BYTECODE_LIBRARY=1
 #DONT_BUILD_RELINKED=1
 LIBRARYNAME=gcc




From lattner at cs.uiuc.edu  Thu Aug 14 21:39:14 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 21:39:14 2003
Subject: [llvm-commits] CVS: llvm/runtime/Makefile
Message-ID: <200308150238.VAA01934@apoc.cs.uiuc.edu>


Changes in directory llvm/runtime:

Makefile updated: 1.6 -> 1.7

---
Log message:

Adjust level, build things in parallel


---
Diffs of the changes:

Index: llvm/runtime/Makefile
diff -u llvm/runtime/Makefile:1.6 llvm/runtime/Makefile:1.7
--- llvm/runtime/Makefile:1.6	Thu Aug 14 21:20:00 2003
+++ llvm/runtime/Makefile	Thu Aug 14 21:38:18 2003
@@ -1,9 +1,9 @@
-# Libraries Makefile:  Build all subdirectories automatically
+# llvm/runtime Makefile:  Build all subdirectories automatically
 
-LEVEL = ../..
+LEVEL = ..
 PARALLEL_DIRS  := $(sort $(filter-out Output/, $(filter-out CVS/, $(wildcard */))))
 
-include ${LEVEL}/Makefile.common
+include $(LEVEL)/Makefile.common
 
 # Install target for libraries: Copy into the gcc install directory in chris's
 # tree...




From lattner at cs.uiuc.edu  Thu Aug 14 22:04:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 22:04:01 2003
Subject: [llvm-commits] CVS: llvm/Makefile.common
Message-ID: <200308150303.WAA09787@apoc.cs.uiuc.edu>


Changes in directory llvm:

Makefile.common updated: 1.112 -> 1.113

---
Log message:

Make sure to create the directory before we cram a .bc file into it


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.112 llvm/Makefile.common:1.113
--- llvm/Makefile.common:1.112	Thu Aug 14 21:18:35 2003
+++ llvm/Makefile.common	Thu Aug 14 22:02:52 2003
@@ -48,6 +48,7 @@
 # For building,
 # 	LLVM, LLVM_SRC_ROOT = BUILD_SRC_ROOT, and
 # 	LLVM_OBJ_ROOT = BUILD_OBJ_ROOT.
+#
 #===-----------------------------------------------------------------------====
 
 #
@@ -537,7 +538,7 @@
 
 
 # Rule for building bytecode libraries.
-$(LIBNAME_BC): $(ObjectsBC) $(LibSubDirs)
+$(LIBNAME_BC): $(ObjectsBC) $(LibSubDirs) $(DESTLIBBYTECODE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) bytecode library =======
 	$(VERB) $(LinkBCLib) -o $@ $(ObjectsBC) $(LibSubDirs) $(LibLinkOpts)
 #
@@ -660,7 +661,6 @@
 USED_LIB_PATHS_G := $(addprefix $(DESTLIBDEBUG)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_O := $(addprefix $(DESTLIBRELEASE)/, $(STATICUSEDLIBS))
 USED_LIB_PATHS_P := $(addprefix $(DESTLIBPROFILE)/, $(STATICUSEDLIBS))
-#LINK_OPTS        := $(TOOLLINKOPTS) $(PLATFORMLINKOPTS)
 
 #
 # Libtool link options:




From lattner at cs.uiuc.edu  Thu Aug 14 22:19:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 22:19:01 2003
Subject: [llvm-commits] CVS: poolalloc/runtime/PoolAllocator/Makefile
Message-ID: <200308150318.WAA09956@apoc.cs.uiuc.edu>


Changes in directory poolalloc/runtime/PoolAllocator:

Makefile updated: 1.1.1.1 -> 1.2

---
Log message:

Adjust to use the new BYTECODE_LIBRARY support


---
Diffs of the changes:

Index: poolalloc/runtime/PoolAllocator/Makefile
diff -u poolalloc/runtime/PoolAllocator/Makefile:1.1.1.1 poolalloc/runtime/PoolAllocator/Makefile:1.2
--- poolalloc/runtime/PoolAllocator/Makefile:1.1.1.1	Mon Aug 11 16:29:15 2003
+++ poolalloc/runtime/PoolAllocator/Makefile	Thu Aug 14 22:18:46 2003
@@ -1,9 +1,6 @@
 LEVEL = ../..
-
-#
-# Name of bytecode library to build.
-#
-BCNAME=poolalloc
+BYTECODE_LIBRARY=1
+DONT_BUILD_RELINKED=1
+LIBRARYNAME=poolalloc
 
 include $(LEVEL)/Makefile.common
-




From lattner at cs.uiuc.edu  Thu Aug 14 22:20:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 22:20:01 2003
Subject: [llvm-commits] CVS: poolalloc/Makefile
Message-ID: <200308150319.WAA09972@apoc.cs.uiuc.edu>


Changes in directory poolalloc:

Makefile updated: 1.2 -> 1.3

---
Log message:

bytecode dir -> runtime dir


---
Diffs of the changes:

Index: poolalloc/Makefile
diff -u poolalloc/Makefile:1.2 poolalloc/Makefile:1.3
--- poolalloc/Makefile:1.2	Tue Aug 12 11:00:47 2003
+++ poolalloc/Makefile	Thu Aug 14 22:19:20 2003
@@ -10,7 +10,7 @@
 #
 # Directories that needs to be built.
 #
-DIRS = lib bytecode
+DIRS = lib runtime
 
 #
 # This is needed since the tags generation code expects a tools directory




From lattner at cs.uiuc.edu  Thu Aug 14 22:35:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 22:35:01 2003
Subject: [llvm-commits] CVS: poolalloc/Makefile.common.in
Message-ID: <200308150334.WAA19393@apoc.cs.uiuc.edu>


Changes in directory poolalloc:

Makefile.common.in updated: 1.1.1.1 -> 1.2

---
Log message:

Remove obsolete junk


---
Diffs of the changes:

Index: poolalloc/Makefile.common.in
diff -u poolalloc/Makefile.common.in:1.1.1.1 poolalloc/Makefile.common.in:1.2
--- poolalloc/Makefile.common.in:1.1.1.1	Mon Aug 11 16:29:15 2003
+++ poolalloc/Makefile.common.in	Thu Aug 14 22:34:44 2003
@@ -14,86 +14,3 @@
 #
 include $(LLVM_SRC_ROOT)/Makefile.common
 
-#
-# Extra rules and information for building bytecode libraries.
-#
-ifdef BCNAME
-
-#
-# Location of the LLVM Tools
-#
-TOOLS    = $(LLVM_OBJ_ROOT)/tools/$(CONFIGURATION)
-
-#
-# LLVM Tool Definitions...
-#
-LCC      = $(LLVMGCCDIR)/bin/gcc
-LCC1     = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1
-LCXX     = $(LLVMGCCDIR)/bin/g++
-LCC1XX   = $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1plus
-LLI      = $(TOOLS)/lli
-LLC      = $(TOOLS)/llc
-LAS      = $(TOOLS)/as
-LGCCAS   = $(TOOLS)/gccas
-LGCCLD   = $(TOOLS)/gccld -L$(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH) -L$(LLVMGCCDIR)/lib
-LGCCLDPROG = $(TOOLS)/gccld
-LDIS     = $(TOOLS)/dis 
-LOPT     = $(TOOLS)/opt
-LLINK    = $(TOOLS)/link
-LANALYZE = $(TOOLS)/analyze
-LBUGPOINT= $(TOOLS)/bugpoint
-
-LCCFLAGS  += -O2 -Wall
-LCXXFLAGS += -O2 -Wall
-
-#
-# Declare the following suffixes
-#
-.SUFFIXES: .bc,.ll
-
-DESTLIBDIR  := $(LEVEL)/bytecode/$(CONFIGURATION)
-DESTLIBNAME := $(DESTLIBDIR)/lib$(BCNAME).bc
-
-all:: $(DESTLIBNAME)
-
-# Figure out what object files we want to build...
-LObjs    := $(sort $(addsuffix .bc, $(basename $(Source))))
-LObjects := $(addprefix $(CONFIGURATION)/, $(LObjs))
-
-.PRECIOUS: $(LObjects)
-
-#
-# If the library specified a list of symbols to export, add an internalize pass
-# to the link options.
-#
-ifdef EXPORTED_SYMBOL_LIST
-LLINK_OPTS += -internalize -internalize-public-api-list=$(EXPORTED_SYMBOL_LIST)
-endif
-
-# Standard set of postlink optimizations...
-LLINK_OPTS +=  -inline -globaldce -funcresolve -deadtypeelim -instcombine -simplifycfg
-
-# Link the library, then perform postlink optimization...
-$(DESTLIBNAME): $(DESTLIBDIR)/.dir $(LObjects) $(LLINK) $(LOPT)
-	$(VERB) $(LLINK) -f $(LObjects) $(LDFLAGS) | \
-	 $(LOPT) -f -q $(LLINK_OPTS) -o $@
-
-#
-# Install target for libraries: Copy into the gcc install directory.
-#
-INSTALL_DIR := $(LLVMGCCDIR)/bytecode-libs/
-
-install:: $(DESTLIBNAME)
-	$(VERB) cp $(DESTLIBNAME) $(INSTALL_DIR)
-
-#
-# Rules for building bytecode libraries
-#
-$(CONFIGURATION)/%.bc: $(CONFIGURATION)/%.ll $(CONFIGURATION)/.dir
-	$(VERB) echo "Assembling " $<
-	$(VERB) $(LAS) -f $< -o $@
-
-$(CONFIGURATION)/%.ll: %.c $(CONFIGURATION)/.dir
-	$(VERB) echo "Compiling " $<
-	$(VERB) $(LLVMGCCDIR)/bin/gcc $(CPPFLAGS) $(LCCFLAGS) -S $< -o $@
-endif




From lattner at cs.uiuc.edu  Thu Aug 14 22:38:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 22:38:00 2003
Subject: [llvm-commits] CVS: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
Message-ID: <200308150337.WAA19411@apoc.cs.uiuc.edu>


Changes in directory poolalloc/lib/PoolAllocate:

PoolAllocate.cpp updated: 1.19 -> 1.20

---
Log message:

Fix bug with static initializer


---
Diffs of the changes:

Index: poolalloc/lib/PoolAllocate/PoolAllocate.cpp
diff -u poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.19 poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.20
--- poolalloc/lib/PoolAllocate/PoolAllocate.cpp:1.19	Wed Aug 13 10:46:57 2003
+++ poolalloc/lib/PoolAllocate/PoolAllocate.cpp	Thu Aug 14 22:37:36 2003
@@ -21,18 +21,16 @@
 using namespace PA;
 
 namespace {
-  const Type *VoidPtrTy = PointerType::get(Type::SByteTy);
+  const Type *VoidPtrTy;
 
   // The type to allocate for a pool descriptor: { sbyte*, uint, uint }
   // void *Data (the data)
   // unsigned NodeSize  (size of an allocated node)
   // unsigned FreeablePool (are slabs in the pool freeable upon calls to 
   //                        poolfree?)
-  const Type *PoolDescType = 
-  StructType::get(make_vector<const Type*>(VoidPtrTy, Type::UIntTy, 
-                                           Type::UIntTy, 0));
+  const Type *PoolDescType;
   
-  const PointerType *PoolDescPtr = PointerType::get(PoolDescType);
+  const PointerType *PoolDescPtr;
   
   RegisterOpt<PoolAllocate>
   X("poolalloc", "Pool allocate disjoint data structures");
@@ -73,7 +71,8 @@
   
   for (Module::iterator MI = M.begin(), ME = M.end(); MI != ME; ++MI) {
 
-    DEBUG(std::cerr << "Processing indirect calls function:" <<  MI->getName() << "\n");
+    DEBUG(std::cerr << "Processing indirect calls function:" <<  MI->getName()
+                    << "\n");
 
     if (MI->isExternal())
       continue;
@@ -123,6 +122,15 @@
 bool PoolAllocate::run(Module &M) {
   if (M.begin() == M.end()) return false;
   CurModule = &M;
+
+  if (VoidPtrTy == 0) {
+    VoidPtrTy = PointerType::get(Type::SByteTy);
+    PoolDescType =
+      StructType::get(make_vector<const Type*>(VoidPtrTy, Type::UIntTy, 
+                                               Type::UIntTy, 0));
+    PoolDescPtr = PointerType::get(PoolDescType);
+  }
+
   
   AddPoolPrototypes();
   BU = &getAnalysis<BUDataStructures>();




From lattner at cs.uiuc.edu  Thu Aug 14 23:29:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:29:02 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/InstrSelectorEmitter.cpp
Message-ID: <200308150428.XAA22291@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

InstrSelectorEmitter.cpp updated: 1.31 -> 1.32

---
Log message:

Add support for nodes with void arguments, like chain nodes


---
Diffs of the changes:

Index: llvm/utils/TableGen/InstrSelectorEmitter.cpp
diff -u llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.31 llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.32
--- llvm/utils/TableGen/InstrSelectorEmitter.cpp:1.31	Tue Aug 12 00:19:49 2003
+++ llvm/utils/TableGen/InstrSelectorEmitter.cpp	Thu Aug 14 23:28:04 2003
@@ -299,6 +299,9 @@
       MadeChange |= Child->updateNodeType(ISE.getTarget().getPointerType(),
                                           TheRecord->getName());
       break;
+    case NodeType::Void:
+      MadeChange |= Child->updateNodeType(MVT::isVoid, TheRecord->getName());
+      break;
     default: assert(0 && "Invalid argument ArgType!");
     }
   }
@@ -449,8 +452,6 @@
         throw "In node " + Node->getName() + ", arg 0 cannot have type 'arg0'!";
       if (a == 1 && ArgTypes.back() == NodeType::Arg1)
         throw "In node " + Node->getName() + ", arg 1 cannot have type 'arg1'!";
-      if (ArgTypes.back() == NodeType::Void)
-        throw "In node " + Node->getName() + ", args cannot be void type!";
     }
     if ((RetTy == NodeType::Arg0 && Args->getSize() == 0) ||
         (RetTy == NodeType::Arg1 && Args->getSize() < 2))




From lattner at cs.uiuc.edu  Thu Aug 14 23:36:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:36:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Target.td
Message-ID: <200308150435.XAA23625@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

Target.td updated: 1.22 -> 1.23

---
Log message:

Add a bunch of new node types, including a new Void dummy register class


---
Diffs of the changes:

Index: llvm/lib/Target/Target.td
diff -u llvm/lib/Target/Target.td:1.22 llvm/lib/Target/Target.td:1.23
--- llvm/lib/Target/Target.td:1.22	Mon Aug 11 23:28:21 2003
+++ llvm/lib/Target/Target.td	Thu Aug 14 23:35:14 2003
@@ -86,6 +86,10 @@
   // Methods - This member can be used to insert arbitrary code into a generated
   // register class.   The normal usage of this is to overload virtual methods.
   code Methods = [{}];
+
+  // isDummyClass - If this is set to true, this register class is not really
+  // part of the target, it is just used for other purposes.
+  bit isDummyClass = 0;
 }
 
 
@@ -156,6 +160,7 @@
 // DAG node definitions used by the instruction selector...
 //
 class DagNodeValType;
+def DNVT_any   : DagNodeValType;  // No constraint on tree node
 def DNVT_void  : DagNodeValType;  // Tree node always returns void
 def DNVT_val   : DagNodeValType;  // A non-void type
 def DNVT_arg0  : DagNodeValType;  // Tree node returns same type as Arg0
@@ -177,7 +182,14 @@
 }
 
 // Magic nodes...
-def set     : DagNode<DNVT_void, [DNVT_val, DNVT_arg0]>;
+def Void       : RegisterClass<isVoid,0,[]> { let isDummyClass = 1; }
+def set        : DagNode<DNVT_void, [DNVT_val, DNVT_arg0]>;
+def chain      : BuiltinDagNode<DNVT_void, [DNVT_void, DNVT_void], "ChainNode">;
+def blockchain : BuiltinDagNode<DNVT_void, [DNVT_void, DNVT_void],
+                                "BlockChainNode">;
+def ChainExpander      : Expander<(chain Void, Void), []>;
+def BlockChainExpander : Expander<(blockchain Void, Void), []>;
+
 
 // Terminals...
 def imm        : BuiltinDagNode<DNVT_val, [], "Constant">;
@@ -213,6 +225,9 @@
 def br      : BuiltinDagNode<DNVT_void, [DNVT_ptr], "Br">;
 def brcond  : BuiltinDagNode<DNVT_void, [DNVT_i8, DNVT_ptr, DNVT_ptr],
                              "BrCond">;
+
+def unspec1 : BuiltinDagNode<DNVT_any , [DNVT_val], "Unspec1">;
+def unspec2 : BuiltinDagNode<DNVT_any , [DNVT_val, DNVT_val], "Unspec2">;
 
 //===----------------------------------------------------------------------===//
 // DAG nonterminals definitions used by the instruction selector...




From lattner at cs.uiuc.edu  Thu Aug 14 23:37:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:37:01 2003
Subject: [llvm-commits] CVS: llvm/utils/TableGen/RegisterInfoEmitter.cpp
Message-ID: <200308150436.XAA23637@apoc.cs.uiuc.edu>


Changes in directory llvm/utils/TableGen:

RegisterInfoEmitter.cpp updated: 1.11 -> 1.12

---
Log message:

Ignore dummy register classes


---
Diffs of the changes:

Index: llvm/utils/TableGen/RegisterInfoEmitter.cpp
diff -u llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.11 llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.12
--- llvm/utils/TableGen/RegisterInfoEmitter.cpp:1.11	Thu Aug  7 14:41:58 2003
+++ llvm/utils/TableGen/RegisterInfoEmitter.cpp	Thu Aug 14 23:36:19 2003
@@ -53,8 +53,11 @@
 
   OS << "namespace " << TargetName << " { // Register classes\n";
   for (unsigned i = 0, e = RegisterClasses.size(); i != e; ++i) {
+    if (RegisterClasses[i]->getValueAsBit("isDummyClass"))
+      continue; // Ignore dummies
+
     const std::string &Name = RegisterClasses[i]->getName();
-    if (Name.size() < 9 || Name[9] != '.')    // Ignore anonymous classes
+    if (Name.size() < 9 || Name[9] != '.')       // Ignore anonymous classes
       OS << "  extern TargetRegisterClass *" << Name << "RegisterClass;\n";
   }
   OS << "} // end of namespace " << TargetName << "\n\n";
@@ -82,6 +85,8 @@
 
   for (unsigned rc = 0, e = RegisterClasses.size(); rc != e; ++rc) {
     Record *RC = RegisterClasses[rc];
+    if (RC->getValueAsBit("isDummyClass")) continue; // Ignore dummies
+
     std::string Name = RC->getName();
     if (Name.size() > 9 && Name[9] == '.') {
       static unsigned AnonCounter = 0;
@@ -197,6 +202,9 @@
 
   OS << "namespace " << Target.getName() << " { // Register classes\n";
   for (unsigned i = 0, e = RegisterClasses.size(); i != e; ++i) {
+    if (RegisterClasses[i]->getValueAsBit("isDummyClass"))
+      continue; // Ignore dummies
+
     const std::string &Name = RegisterClasses[i]->getName();
     if (Name.size() < 9 || Name[9] != '.')    // Ignore anonymous classes
       OS << "  TargetRegisterClass *" << Name << "RegisterClass = &"




From lattner at cs.uiuc.edu  Thu Aug 14 23:51:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:51:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86InstrInfo.td
Message-ID: <200308150450.XAA23697@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86InstrInfo.td updated: 1.9 -> 1.10

---
Log message:

Add support for unconditional branches and for emitting JE instructions


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.9 llvm/lib/Target/X86/X86InstrInfo.td:1.10
--- llvm/lib/Target/X86/X86InstrInfo.td:1.9	Mon Aug 11 16:30:00 2003
+++ llvm/lib/Target/X86/X86InstrInfo.td	Thu Aug 14 23:50:49 2003
@@ -121,10 +121,10 @@
 let isBranch = 1, isTerminator = 1 in
   class IBr<string name, bits<8> opcode> : X86Inst<name, opcode, RawFrm, NoArg>;
 
-def JMP : IBr<"jmp", 0xE9>;
+def JMP : IBr<"jmp", 0xE9>, Pattern<(br basicblock)>;
 def JB  : IBr<"jb" , 0x82>, TB;
 def JAE : IBr<"jae", 0x83>, TB;
-def JE  : IBr<"je" , 0x84>, TB;
+def JE  : IBr<"je" , 0x84>, TB, Pattern<(isVoid (unspec1 basicblock))>;
 def JNE : IBr<"jne", 0x85>, TB;
 def JBE : IBr<"jbe", 0x86>, TB;
 def JA  : IBr<"ja" , 0x87>, TB;
@@ -318,7 +318,8 @@
 // Integer comparisons
 def CMPrr8  : X86Inst<"cmp", 0x38, MRMDestReg, Arg8 >;              // compare R8, R8
 def CMPrr16 : X86Inst<"cmp", 0x39, MRMDestReg, Arg16>, OpSize;      // compare R16, R16
-def CMPrr32 : X86Inst<"cmp", 0x39, MRMDestReg, Arg32>;              // compare R32, R32
+def CMPrr32 : X86Inst<"cmp", 0x39, MRMDestReg, Arg32>,              // compare R32, R32
+              Pattern<(isVoid (unspec2 R32, R32))>;
 def CMPri8  : X86Inst<"cmp", 0x80, MRMS7r    , Arg8 >;              // compare R8, imm8
 def CMPri16 : X86Inst<"cmp", 0x81, MRMS7r    , Arg16>, OpSize;      // compare R16, imm16
 def CMPri32 : X86Inst<"cmp", 0x81, MRMS7r    , Arg32>;              // compare R32, imm32
@@ -451,3 +452,14 @@
                          [(MOVmr32 R32:$dest, frameidx:$fi, 1, 0/*NoReg*/, 0)]>;
 
 
+def LOAD_R16 : Expander<(set R16:$dest, (load R32:$src)),
+                         [(MOVmr16 R16:$dest, R32:$src, 1, 0/*NoReg*/, 0)]>;
+
+def LOAD_R32 : Expander<(set R32:$dest, (load R32:$src)),
+                         [(MOVmr32 R32:$dest, R32:$src, 1, 0/*NoReg*/, 0)]>;
+
+def BR_EQ : Expander<(brcond (seteq R32:$a1, R32:$a2),
+                             basicblock:$d1, basicblock:$d2),
+                     [(CMPrr32 R32:$a1, R32:$a2),
+                      (JE basicblock:$d1),
+                      (JMP basicblock:$d2)]>;




From lattner at cs.uiuc.edu  Thu Aug 14 23:53:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:53:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectPattern.cpp
Message-ID: <200308150452.XAA23714@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

InstSelectPattern.cpp updated: 1.2 -> 1.3

---
Log message:

Adjust to new API, add expandCall stub


---
Diffs of the changes:

Index: llvm/lib/Target/X86/InstSelectPattern.cpp
diff -u llvm/lib/Target/X86/InstSelectPattern.cpp:1.2 llvm/lib/Target/X86/InstSelectPattern.cpp:1.3
--- llvm/lib/Target/X86/InstSelectPattern.cpp:1.2	Wed Aug 13 13:18:13 2003
+++ llvm/lib/Target/X86/InstSelectPattern.cpp	Thu Aug 14 23:51:59 2003
@@ -21,12 +21,6 @@
 // Include the generated instruction selector...
 #include "X86GenInstrSelector.inc"
 
-
-//===----------------------------------------------------------------------===//
-//  User code
-//
-
-
 namespace {
   struct ISel : public FunctionPass, SelectionDAGTargetBuilder {
     TargetMachine &TM;
@@ -49,12 +43,14 @@
   public:  // Implementation of the SelectionDAGTargetBuilder class...
     /// expandArguments - Add nodes to the DAG to indicate how to load arguments
     /// off of the X86 stack.
-    void expandArguments(SelectionDAG &SD, MachineFunction &MF);
+    void expandArguments(SelectionDAG &SD);
+    void expandCall(SelectionDAG &SD, CallInst &CI);
   };
 }
 
 
-void ISel::expandArguments(SelectionDAG &SD, MachineFunction &F) {
+void ISel::expandArguments(SelectionDAG &SD) {
+
   // Add DAG nodes to load the arguments...  On entry to a function on the X86,
   // the stack frame looks like this:
   //
@@ -63,10 +59,11 @@
   // [ESP + 8] -- second argument, if first argument is four bytes in size
   //    ... 
   //
-  unsigned ArgOffset = 0;   // Frame mechanisms handle retaddr slot
+  MachineFunction &F = SD.getMachineFunction();
   MachineFrameInfo *MFI = F.getFrameInfo();
   const Function &Fn = *F.getFunction();
   
+  unsigned ArgOffset = 0;   // Frame mechanisms handle retaddr slot
   for (Function::const_aiterator I = Fn.abegin(), E = Fn.aend(); I != E; ++I) {
     MVT::ValueType ObjectVT = SD.getValueType(I->getType());
     unsigned ArgIncrement = 4;
@@ -84,7 +81,6 @@
     int FI = MFI->CreateFixedObject(ObjSize, ArgOffset);
     
     // Create the SelectionDAG nodes corresponding to a load from this parameter
-    // FIXME:
     SelectionDAGNode *FIN = new SelectionDAGNode(ISD::FrameIndex, MVT::i32);
     FIN->addValue(new ReducedValue_FrameIndex_i32(FI));
 
@@ -105,6 +101,10 @@
   // the start of the first vararg value... for expansion of llvm.va_start.
   if (Fn.getFunctionType()->isVarArg())
     VarArgsFrameIndex = MFI->CreateFixedObject(1, ArgOffset);
+}
+
+void ISel::expandCall(SelectionDAG &SD, CallInst &CI) {
+  assert(0 && "ISel::expandCall not implemented!");
 }
 
 




From lattner at cs.uiuc.edu  Thu Aug 14 23:54:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:54:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Selection/DAGBuilder.cpp SelectionDAG.cpp
Message-ID: <200308150453.XAA23759@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/Selection:

DAGBuilder.cpp updated: 1.1 -> 1.2
SelectionDAG.cpp updated: 1.1 -> 1.2

---
Log message:

Add a bunch of new node types, etc


---
Diffs of the changes:

Index: llvm/lib/CodeGen/Selection/DAGBuilder.cpp
diff -u llvm/lib/CodeGen/Selection/DAGBuilder.cpp:1.1 llvm/lib/CodeGen/Selection/DAGBuilder.cpp:1.2
--- llvm/lib/CodeGen/Selection/DAGBuilder.cpp:1.1	Mon Aug 11 09:57:33 2003
+++ llvm/lib/CodeGen/Selection/DAGBuilder.cpp	Thu Aug 14 23:53:16 2003
@@ -6,25 +6,31 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/CodeGen/SelectionDAG.h"
+#include "llvm/Constants.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
-#include "llvm/Support/InstVisitor.h"
+#include "llvm/Type.h"
 #include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Type.h"
-#include "llvm/Constants.h"
+#include "llvm/Support/InstVisitor.h"
 
 struct SelectionDAGBuilder : public InstVisitor<SelectionDAGBuilder> {
   // DAG - the current dag we are building.
   SelectionDAG &DAG;
 
+  // SDTB - The target-specific builder interface, which indicates how to expand
+  // extremely target-specific aspects of the representation, such as function
+  // calls and arguments.
+  SelectionDAGTargetBuilder &SDTB;
+
   // BB - The current machine basic block we are working on.
   MachineBasicBlock *BB;
 
   // CurRoot - The root built for the current basic block.
   SelectionDAGNode *CurRoot;
 
-  SelectionDAGBuilder(SelectionDAG &dag) : DAG(dag), BB(0), CurRoot(0) {}
+  SelectionDAGBuilder(SelectionDAG &dag, SelectionDAGTargetBuilder &sdtb)
+    : DAG(dag), SDTB(sdtb), BB(0), CurRoot(0) {}
 
   void visitBB(BasicBlock &bb);
 
@@ -33,14 +39,21 @@
   void visitAdd(BinaryOperator &BO);
   void visitSub(BinaryOperator &BO);
   void visitMul(BinaryOperator &BO);
-  void visitRet(ReturnInst &RI);
 
   void visitAnd(BinaryOperator &BO);
   void visitOr (BinaryOperator &BO);
   void visitXor(BinaryOperator &BO);
 
+  void visitSetEQ(BinaryOperator &BO);
+
+  void visitLoad(LoadInst &LI);
+  void visitCall(CallInst &CI);
+
+  void visitBr(BranchInst &BI);
+  void visitRet(ReturnInst &RI);
+
   void visitInstruction(Instruction &I) {
-    std::cerr << "Instruction Selection cannot select: " << I;
+    std::cerr << "DAGBuilder: Cannot instruction select: " << I;
     abort();
   }
 
@@ -116,6 +129,10 @@
         Entry->addValue(new ReducedValue_Constant_f64(CFP->getValue()));
     }
     if (Entry) return Entry;
+  } else if (BasicBlock *BB = dyn_cast<BasicBlock>(V)) {
+    Entry = new SelectionDAGNode(ISD::BasicBlock, ValueType);
+    Entry->addValue(new ReducedValue_BasicBlock_i32(DAG.BlockMap[BB]));
+    return Entry;
   }
 
   std::cerr << "Unhandled LLVM value in DAG Builder!: " << *V << "\n";
@@ -144,9 +161,9 @@
     else {
       // The previous basic block AND this basic block had roots, insert a
       // block chain node now...
-        CurRoot = DAG.addNode(new SelectionDAGNode(ISD::BlockChainNode,
-                                                   MVT::isVoid,
-                                                   BB, OldRoot, CurRoot));
+      CurRoot = DAG.addNode(new SelectionDAGNode(ISD::BlockChainNode,
+                                                 MVT::isVoid,
+                                                 BB, OldRoot, CurRoot));
     }
   }
 }
@@ -180,6 +197,11 @@
   getNodeFor(BO)->setNode(ISD::Xor, BB, getNodeFor(BO.getOperand(0)),
                           getNodeFor(BO.getOperand(1)));
 }
+void SelectionDAGBuilder::visitSetEQ(BinaryOperator &BO) {
+  getNodeFor(BO)->setNode(ISD::SetEQ, BB, getNodeFor(BO.getOperand(0)),
+                          getNodeFor(BO.getOperand(1)));
+}
+
 
 void SelectionDAGBuilder::visitRet(ReturnInst &RI) {
   if (RI.getNumOperands()) {         // Value return
@@ -191,9 +213,30 @@
 }
 
 
+void SelectionDAGBuilder::visitBr(BranchInst &BI) {
+  if (BI.isUnconditional())
+    addSeqNode(new SelectionDAGNode(ISD::Br, MVT::isVoid, BB,
+                                    getNodeFor(BI.getOperand(0))));
+  else
+    addSeqNode(new SelectionDAGNode(ISD::BrCond, MVT::isVoid, BB,
+                                    getNodeFor(BI.getCondition()),
+                                    getNodeFor(BI.getSuccessor(0)),
+                                    getNodeFor(BI.getSuccessor(1))));
+}
+
+
+void SelectionDAGBuilder::visitLoad(LoadInst &LI) {
+  // FIXME: this won't prevent reordering of loads!
+  getNodeFor(LI)->setNode(ISD::Load, BB, getNodeFor(LI.getOperand(0)));  
+}
+
+void SelectionDAGBuilder::visitCall(CallInst &CI) {
+  SDTB.expandCall(DAG, CI);
+}
+
 
 
-// SelectionDAG constructor - Just use the SeelectionDAGBuilder to do all of the
+// SelectionDAG constructor - Just use the SelectionDAGBuilder to do all of the
 // dirty work...
 SelectionDAG::SelectionDAG(MachineFunction &f, const TargetMachine &tm,
                            SelectionDAGTargetBuilder &SDTB)
@@ -213,9 +256,9 @@
   for (Function::const_iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
     F.getBasicBlockList().push_back(BlockMap[I] = new MachineBasicBlock(I));
 
-  SDTB.expandArguments(*this, f);
+  SDTB.expandArguments(*this);
 
-  SelectionDAGBuilder SDB(*this);
+  SelectionDAGBuilder SDB(*this, SDTB);
   for (Function::const_iterator I = Fn.begin(), E = Fn.end(); I != E; ++I)
     SDB.visitBB(const_cast<BasicBlock&>(*I));
   Root = SDB.CurRoot;


Index: llvm/lib/CodeGen/Selection/SelectionDAG.cpp
diff -u llvm/lib/CodeGen/Selection/SelectionDAG.cpp:1.1 llvm/lib/CodeGen/Selection/SelectionDAG.cpp:1.2
--- llvm/lib/CodeGen/Selection/SelectionDAG.cpp:1.1	Mon Aug 11 09:57:33 2003
+++ llvm/lib/CodeGen/Selection/SelectionDAG.cpp	Thu Aug 14 23:53:16 2003
@@ -37,6 +37,7 @@
   case Type::ULongTyID:   return MVT::i64;
   case Type::FloatTyID:   return MVT::f32;
   case Type::DoubleTyID:  return MVT::f64;
+  case Type::LabelTyID:
   case Type::PointerTyID: return PointerType;
   }
 }
@@ -79,8 +80,11 @@
   case ISD::ChainNode:      std::cerr << "ChainNode"; break;
   case ISD::BlockChainNode: std::cerr << "BlockChainNode"; break;
   case ISD::ProtoNode:      std::cerr << "ProtoNode"; break;
+
   case ISD::Constant:       std::cerr << "Constant"; break;
   case ISD::FrameIndex:     std::cerr << "FrameIndex"; break;
+  case ISD::BasicBlock:     std::cerr << "BasicBlock"; break;
+
   case ISD::Plus:           std::cerr << "Plus"; break;
   case ISD::Minus:          std::cerr << "Minus"; break;
   case ISD::Times:          std::cerr << "Times"; break;
@@ -91,7 +95,16 @@
   case ISD::And:            std::cerr << "And"; break;
   case ISD::Or:             std::cerr << "Or"; break;
   case ISD::Xor:            std::cerr << "Xor"; break;
+
+  case ISD::SetEQ:          std::cerr << "SetEQ"; break;
+  case ISD::SetNE:          std::cerr << "SetNE"; break;
+  case ISD::SetLT:          std::cerr << "SetLT"; break;
+  case ISD::SetLE:          std::cerr << "SetLE"; break;
+  case ISD::SetGT:          std::cerr << "SetGT"; break;
+  case ISD::SetGE:          std::cerr << "SetGE"; break;
+
   case ISD::Br:             std::cerr << "Br"; break;
+  case ISD::BrCond:         std::cerr << "BrCond"; break;
   case ISD::Switch:         std::cerr << "Switch"; break;
   case ISD::Ret:            std::cerr << "Ret"; break;
   case ISD::RetVoid:        std::cerr << "RetVoid"; break;
@@ -99,6 +112,9 @@
   case ISD::Store:          std::cerr << "Store"; break;
   case ISD::PHI:            std::cerr << "PHI"; break;
   case ISD::Call:           std::cerr << "Call"; break;
+
+  case ISD::Unspec1:        std::cerr << "Unspec1"; break;
+  case ISD::Unspec2:        std::cerr << "Unspec2"; break;
   }
 
   std::cerr << "\n";




From lattner at cs.uiuc.edu  Thu Aug 14 23:54:08 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:54:08 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/SelectionDAG.h
Message-ID: <200308150453.XAA23742@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

SelectionDAG.h updated: 1.1 -> 1.2

---
Log message:

Add support for basic blocks, unary/binary unspecs, conditional branches, ...


---
Diffs of the changes:

Index: llvm/include/llvm/CodeGen/SelectionDAG.h
diff -u llvm/include/llvm/CodeGen/SelectionDAG.h:1.1 llvm/include/llvm/CodeGen/SelectionDAG.h:1.2
--- llvm/include/llvm/CodeGen/SelectionDAG.h:1.1	Mon Aug 11 09:56:26 2003
+++ llvm/include/llvm/CodeGen/SelectionDAG.h	Thu Aug 14 23:52:51 2003
@@ -22,6 +22,7 @@
 class Value;
 class Type;
 class Instruction;
+class CallInst;
 class BasicBlock;
 class MachineBasicBlock;
 class MachineFunction;
@@ -45,8 +46,8 @@
     // ProtoNodes are nodes that are only half way constructed.
     ProtoNode,
 
-    // Leaf nodes.
-    Constant, FrameIndex,
+    // Leaf nodes
+    Constant, FrameIndex, BasicBlock,
 
     // Simple binary arithmetic operators
     Plus, Minus, Times, SDiv, UDiv, SRem, URem,
@@ -54,11 +55,17 @@
     // Bitwise operators
     And, Or, Xor,
 
+    // Comparisons
+    SetEQ, SetNE, SetLT, SetLE, SetGT, SetGE,
+
     // Control flow instructions
-    Br, Switch, Ret, RetVoid,
+    Br, BrCond, Switch, Ret, RetVoid,
 
     // Other operators
     Load, Store, PHI, Call,
+
+    // Unknown operators, of a specified arity
+    Unspec1, Unspec2
   };
 }
 
@@ -189,6 +196,13 @@
     assert(NT != ISD::ProtoNode && "Cannot specify uses for a protonode!");
     Uses.reserve(2); Uses.push_back(N1); Uses.push_back(N2);
   }
+  SelectionDAGNode(ISD::NodeType NT, MVT::ValueType VT, MachineBasicBlock *bb,
+                   SelectionDAGNode *N1, SelectionDAGNode *N2,
+                   SelectionDAGNode *N3)
+    : NodeType(NT), ValueType(VT), BB(bb), ValList(0), Costs(0) {
+    assert(NT != ISD::ProtoNode && "Cannot specify uses for a protonode!");
+    Uses.reserve(3); Uses.push_back(N1); Uses.push_back(N2); Uses.push_back(N3);
+  }
 
   ~SelectionDAGNode() { delete [] Costs; delete ValList; }
 
@@ -295,7 +309,12 @@
   /// current function.  If any of the incoming arguments lives on the stack,
   /// this method should also create the stack slots for the arguments as
   /// necessary.
-  virtual void expandArguments(SelectionDAG &SD, MachineFunction &MF) = 0;
+  virtual void expandArguments(SelectionDAG &SD) = 0;
+
+  /// expandCall - This method is called once per function call by the
+  /// SelectionDAG construction algorithm.  It must add DAG nodes to the
+  /// SelectionDAG specified to perform that call.
+  virtual void expandCall(SelectionDAG &SD, CallInst &CI) = 0;
 };
 
 namespace ISD {
@@ -310,6 +329,8 @@
 
     FrameIndex_i32_Slot,
     FrameIndex_i64_Slot,
+    BasicBlock_i32_Slot,
+    BasicBlock_i64_Slot,
     NumBuiltinSlots
   };
 }
@@ -322,6 +343,8 @@
 
 typedef ReducedValue<int, ISD::FrameIndex_i32_Slot > ReducedValue_FrameIndex_i32;
 typedef ReducedValue<int, ISD::FrameIndex_i64_Slot > ReducedValue_FrameIndex_i64;
+typedef ReducedValue<MachineBasicBlock*, ISD::BasicBlock_i32_Slot > ReducedValue_BasicBlock_i32;
+typedef ReducedValue<MachineBasicBlock*, ISD::BasicBlock_i64_Slot > ReducedValue_BasicBlock_i64;
 
 typedef ReducedValue<bool          , ISD::Constant_i1_Slot > ReducedValue_Constant_i1;
 typedef ReducedValue<unsigned char , ISD::Constant_i8_Slot > ReducedValue_Constant_i8;




From lattner at cs.uiuc.edu  Thu Aug 14 23:54:14 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:54:14 2003
Subject: [llvm-commits] CVS: llvm/Makefile
Message-ID: <200308150453.XAA23771@apoc.cs.uiuc.edu>


Changes in directory llvm:

Makefile updated: 1.5 -> 1.6

---
Log message:

build the new runtime directory


---
Diffs of the changes:

Index: llvm/Makefile
diff -u llvm/Makefile:1.5 llvm/Makefile:1.6
--- llvm/Makefile:1.5	Tue Aug 12 13:51:48 2003
+++ llvm/Makefile	Thu Aug 14 23:53:45 2003
@@ -1,5 +1,5 @@
 LEVEL = .
-DIRS = lib/Support utils lib tools
+DIRS = lib/Support utils lib tools runtime
 OPTIONAL_DIRS = projects
 
 include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Thu Aug 14 23:56:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:56:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/Makefile
Message-ID: <200308150455.XAA24338@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

Makefile updated: 1.12 -> 1.13

---
Log message:

rename selection directory and library to SelectionDAG


---
Diffs of the changes:

Index: llvm/lib/CodeGen/Makefile
diff -u llvm/lib/CodeGen/Makefile:1.12 llvm/lib/CodeGen/Makefile:1.13
--- llvm/lib/CodeGen/Makefile:1.12	Tue Aug 12 21:37:24 2003
+++ llvm/lib/CodeGen/Makefile	Thu Aug 14 23:55:20 2003
@@ -1,5 +1,5 @@
 LEVEL = ../..
-PARALLEL_DIRS = PreOpts InstrSelection InstrSched RegAlloc PostOpts Selection
+PARALLEL_DIRS = PreOpts InstrSelection InstrSched RegAlloc PostOpts SelectionDAG
 LIBRARYNAME = codegen
 
 include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Thu Aug 14 23:56:07 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:56:07 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/SelectionDAG/Makefile
Message-ID: <200308150455.XAA24345@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/SelectionDAG:

Makefile updated: 1.1 -> 1.2

---
Log message:

rename selection directory and library to SelectionDAG



---
Diffs of the changes:

Index: llvm/lib/CodeGen/SelectionDAG/Makefile
diff -u llvm/lib/CodeGen/SelectionDAG/Makefile:1.1 llvm/lib/CodeGen/SelectionDAG/Makefile:1.2
--- llvm/lib/CodeGen/SelectionDAG/Makefile:1.1	Mon Aug 11 09:57:33 2003
+++ llvm/lib/CodeGen/SelectionDAG/Makefile	Thu Aug 14 23:55:22 2003
@@ -1,5 +1,5 @@
 LEVEL = ../../..
 PARALLEL_DIRS =
-LIBRARYNAME = selection
+LIBRARYNAME = selectiondag
 
 include $(LEVEL)/Makefile.common




From lattner at cs.uiuc.edu  Thu Aug 14 23:57:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:57:01 2003
Subject: [llvm-commits] CVS: llvm/tools/llc/Makefile
Message-ID: <200308150456.XAA24367@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/llc:

Makefile updated: 1.39 -> 1.40

---
Log message:

rename selection library to selectiondag



---
Diffs of the changes:

Index: llvm/tools/llc/Makefile
diff -u llvm/tools/llc/Makefile:1.39 llvm/tools/llc/Makefile:1.40
--- llvm/tools/llc/Makefile:1.39	Tue Aug 12 21:28:20 2003
+++ llvm/tools/llc/Makefile	Thu Aug 14 23:56:01 2003
@@ -2,7 +2,7 @@
 TOOLNAME = llc
 USEDLIBS = sparc \
            x86 \
-	   selection \
+	   selectiondag \
            regalloc \
            sched \
            select \




From lattner at cs.uiuc.edu  Thu Aug 14 23:57:08 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:57:08 2003
Subject: [llvm-commits] CVS: llvm/tools/lli/Makefile
Message-ID: <200308150456.XAA24376@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/lli:

Makefile updated: 1.36 -> 1.37

---
Log message:

rename selection library to selectiondag


---
Diffs of the changes:

Index: llvm/tools/lli/Makefile
diff -u llvm/tools/lli/Makefile:1.36 llvm/tools/lli/Makefile:1.37
--- llvm/tools/lli/Makefile:1.36	Tue Aug 12 21:28:16 2003
+++ llvm/tools/lli/Makefile	Thu Aug 14 23:56:09 2003
@@ -19,7 +19,7 @@
 # What the X86 JIT requires
 ifdef ENABLE_X86_JIT
   CPPFLAGS += -DENABLE_X86_JIT
-  JITLIBS  += x86 selection
+  JITLIBS  += x86 selectiondag
   # X86 doesn't require any ARCHLIBS
 endif
 




From lattner at cs.uiuc.edu  Thu Aug 14 23:57:15 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:57:15 2003
Subject: [llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Message-ID: <200308150456.XAA24899@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

gccld.cpp updated: 1.38 -> 1.39

---
Log message:

Revert my last (accidental) checkin, but keep the typeo fix


---
Diffs of the changes:

Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.38 llvm/tools/gccld/gccld.cpp:1.39
--- llvm/tools/gccld/gccld.cpp:1.38	Thu Aug 14 23:55:59 2003
+++ llvm/tools/gccld/gccld.cpp	Thu Aug 14 23:56:47 2003
@@ -387,7 +387,6 @@
   // arguments).  This pass merges the two functions.
   //
   Passes.add(createFunctionResolvingPass());
-  Passes.add(createFunctionResolvingPass());
 
   if (!NoInternalize) {
     // Now that composite has been compiled, scan through the module, looking




From lattner at cs.uiuc.edu  Thu Aug 14 23:58:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Aug 14 23:58:01 2003
Subject: [llvm-commits] CVS: llvm/tools/gccld/gccld.cpp
Message-ID: <200308150457.XAA25495@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/gccld:

gccld.cpp updated: 1.37 -> 1.38

---
Log message:

rename selection library to selectiondag


---
Diffs of the changes:

Index: llvm/tools/gccld/gccld.cpp
diff -u llvm/tools/gccld/gccld.cpp:1.37 llvm/tools/gccld/gccld.cpp:1.38
--- llvm/tools/gccld/gccld.cpp:1.37	Thu Jun 26 00:29:50 2003
+++ llvm/tools/gccld/gccld.cpp	Thu Aug 14 23:55:59 2003
@@ -367,7 +367,7 @@
   PassManager Passes;
 
   // Add an appropriate TargetData instance for this module...
-  Passes.add(new TargetData("gccas", Composite.get()));
+  Passes.add(new TargetData("gccld", Composite.get()));
 
   // Linking modules together can lead to duplicated global constants, only keep
   // one copy of each constant...
@@ -386,6 +386,7 @@
   // function that does not get a body filled in (the real function has typed
   // arguments).  This pass merges the two functions.
   //
+  Passes.add(createFunctionResolvingPass());
   Passes.add(createFunctionResolvingPass());
 
   if (!NoInternalize) {




From lattner at cs.uiuc.edu  Fri Aug 15 00:21:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 00:21:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
Message-ID: <200308150520.AAA01647@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen/InstrSched:

InstrScheduling.cpp updated: 1.55 -> 1.56

---
Log message:

Remove uses of the NonCopyable class, to make the doxygen output look better


---
Diffs of the changes:

Index: llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
diff -u llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.55 llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.56
--- llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp:1.55	Thu Aug 14 01:09:29 2003
+++ llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp	Fri Aug 15 00:20:06 2003
@@ -41,7 +41,10 @@
 // in a single cycle.
 //----------------------------------------------------------------------
 
-class InstrGroup: public NonCopyable {
+class InstrGroup {
+  InstrGroup(const InstrGroup&);       // DO NOT IMPLEMENT
+  void operator=(const InstrGroup&);   // DO NOT IMPLEMENT
+  
 public:
   inline const SchedGraphNode* operator[](unsigned int slotNum) const {
     assert(slotNum  < group.size());
@@ -124,12 +127,14 @@
 // Represents the schedule of machine instructions for a single basic block.
 //----------------------------------------------------------------------
 
-class InstrSchedule: public NonCopyable {
-private:
+class InstrSchedule {
   const unsigned int nslots;
   unsigned int numInstr;
   std::vector<InstrGroup*> groups;		// indexed by cycle number
   std::vector<cycles_t> startTime;		// indexed by node id
+
+  InstrSchedule(InstrSchedule&);   // DO NOT IMPLEMENT
+  void operator=(InstrSchedule&);  // DO NOT IMPLEMENT
   
 public: // iterators
   typedef ScheduleIterator<SchedGraphNode> iterator;
@@ -292,14 +297,15 @@
 // Delay slots are simply indexed by slot number 1 ... numDelaySlots
 //----------------------------------------------------------------------
 
-class DelaySlotInfo: public NonCopyable {
-private:
+class DelaySlotInfo {
   const SchedGraphNode* brNode;
-  unsigned int ndelays;
+  unsigned ndelays;
   std::vector<const SchedGraphNode*> delayNodeVec;
   cycles_t delayedNodeCycle;
-  unsigned int delayedNodeSlotNum;
+  unsigned delayedNodeSlotNum;
   
+  DelaySlotInfo(const DelaySlotInfo &);  // DO NOT IMPLEMENT
+  void operator=(const DelaySlotInfo&);  // DO NOT IMPLEMENT
 public:
   /*ctor*/	DelaySlotInfo		(const SchedGraphNode* _brNode,
 					 unsigned _ndelays)
@@ -334,7 +340,9 @@
 // Represents the schedule of machine instructions for a single basic block.
 //----------------------------------------------------------------------
 
-class SchedulingManager: public NonCopyable {
+class SchedulingManager {
+  SchedulingManager(SchedulingManager &);    // DO NOT IMPLEMENT
+  void operator=(const SchedulingManager &); // DO NOT IMPLEMENT
 public: // publicly accessible data members
   const unsigned nslots;
   const TargetSchedInfo& schedInfo;
@@ -342,7 +350,7 @@
   InstrSchedule isched;
   
 private:
-  unsigned int totalInstrCount;
+  unsigned totalInstrCount;
   cycles_t curTime;
   cycles_t nextEarliestIssueTime;		// next cycle we can issue
   // indexed by slot#




From lattner at cs.uiuc.edu  Fri Aug 15 00:22:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 00:22:02 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetMachine.h
Message-ID: <200308150521.AAA01668@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetMachine.h updated: 1.32 -> 1.33

---
Log message:

Remove extraneous #include


---
Diffs of the changes:

Index: llvm/include/llvm/Target/TargetMachine.h
diff -u llvm/include/llvm/Target/TargetMachine.h:1.32 llvm/include/llvm/Target/TargetMachine.h:1.33
--- llvm/include/llvm/Target/TargetMachine.h:1.32	Wed Aug 13 13:17:25 2003
+++ llvm/include/llvm/Target/TargetMachine.h	Fri Aug 15 00:21:30 2003
@@ -8,7 +8,6 @@
 #define LLVM_TARGET_TARGETMACHINE_H
 
 #include "llvm/Target/TargetData.h"
-#include "Support/NonCopyable.h"
 
 class TargetInstrInfo;
 class TargetInstrDescriptor;




From lattner at cs.uiuc.edu  Fri Aug 15 10:22:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 10:22:01 2003
Subject: [llvm-commits] CVS: llvm/Makefile.common
Message-ID: <200308151521.KAA14036@zion.cs.uiuc.edu>


Changes in directory llvm:

Makefile.common updated: 1.113 -> 1.114

---
Log message:

Add llvm tools to path of LLVMGCC


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.113 llvm/Makefile.common:1.114
--- llvm/Makefile.common:1.113	Thu Aug 14 22:02:52 2003
+++ llvm/Makefile.common	Fri Aug 15 10:20:52 2003
@@ -313,9 +313,9 @@
 #--------------------------------------------------------------------------
 # The LLVM GCC front-end in C and C++ flavors
 #
-LLVMGCC := $(LLVMGCCDIR)/bin/gcc
+LLVMGCC := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/gcc
 LCC1    := $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1
-LLVMGXX := $(LLVMGCCDIR)/bin/g++
+LLVMGXX := PATH=$(LLVMTOOLCURRENT):$(PATH) $(LLVMGCCDIR)/bin/g++
 LCC1XX  := $(LLVMGCCDIR)/lib/gcc-lib/$(LLVMGCCARCH)/cc1plus
 
 #--------------------------------------------------------------------------




From brukman at cs.uiuc.edu  Fri Aug 15 10:30:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Aug 15 10:30:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.Makefile
Message-ID: <200308151529.KAA12513@zion.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.22 -> 1.23

---
Log message:

Get the LLC execution time from the correct file.


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.22 llvm/test/Programs/TEST.nightly.Makefile:1.23
--- llvm/test/Programs/TEST.nightly.Makefile:1.22	Thu Aug 14 19:29:17 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Fri Aug 15 10:29:25 2003
@@ -56,7 +56,7 @@
 	@-if test -f Output/$*.exe-llc; then \
 	  echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-llc-time: " >> $@;\
-	  grep "^real" $@ >> $@;\
+	  grep "^real" $(INFO_PREFIX)llc.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: llc $(RELDIR)/$*" >> $@;\




From brukman at cs.uiuc.edu  Fri Aug 15 11:16:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Aug 15 11:16:02 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
Message-ID: <200308151615.LAA21911@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcV9CodeEmitter.cpp updated: 1.28 -> 1.29

---
Log message:

Fix register and parameter numbers in saving double FP registers.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.28 llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.29
--- llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.28	Thu Aug 14 19:26:50 2003
+++ llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp	Fri Aug 15 11:15:28 2003
@@ -218,7 +218,7 @@
 
   __asm__ __volatile__ (// Save Double FP registers
                         "std %%f32, %0;\n\t"  "std %%f34, %1;\n\t"
-                        "std %%f32, %0;\n\t"  "std %%f34, %1;\n\t"
+                        "std %%f36, %2;\n\t"  "std %%f38, %3;\n\t"
                         "std %%f40, %4;\n\t"  "std %%f42, %5;\n\t"
                         "std %%f44, %6;\n\t"  "std %%f46, %7;\n\t"
                         "std %%f48, %8;\n\t"  "std %%f50, %9;\n\t"




From lattner at cs.uiuc.edu  Fri Aug 15 11:27:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 11:27:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.Makefile TEST.nightly.report
Message-ID: <200308151626.LAA07457@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.23 -> 1.24
TEST.nightly.report updated: 1.9 -> 1.10

---
Log message:

Add timings for how long LLC takes to run.
Move compiled llc program time into the executions column


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.23 llvm/test/Programs/TEST.nightly.Makefile:1.24
--- llvm/test/Programs/TEST.nightly.Makefile:1.23	Fri Aug 15 10:29:25 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Fri Aug 15 11:26:16 2003
@@ -22,8 +22,8 @@
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.compile.report.txt): \
 Output/%.nightly.compile.report.txt: Output/%.llvm.bc $(LGCCAS)
 	@echo > $@
-	@echo '$(LGCCAS) Output/$*.linked.rll -o/dev/null $(TIMEOPT) >> $@ 2>&1'
-	@-if ($(LGCCAS) Output/$*.linked.rll -o /dev/null $(TIMEOPT) >> $@ 2>&1)\
+	@echo '$(LGCCAS) Output/$*.linked.rll -o /dev/null $(TIMEOPT) >>$@ 2>&1'
+	@-if ($(LGCCAS) Output/$*.linked.rll -o /dev/null $(TIMEOPT) >>$@ 2>&1)\
 	;then \
 	  echo "TEST-PASS: compile $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-compile: " >> $@;\
@@ -55,6 +55,9 @@
 	-head -n 100 Output/$*.exe-llc >> $@
 	@-if test -f Output/$*.exe-llc; then \
 	  echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
+	  $(LLC) $< -o /dev/null -f $(TIMEOPT) >> $@ 2>&1; \
+	  printf "TEST-RESULT-llc: " >> $@;\
+	  grep "Total Execution Time" $@.info >> $@;\
 	  printf "TEST-RESULT-llc-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)llc.time >> $@;\
 	  echo >> $@;\


Index: llvm/test/Programs/TEST.nightly.report
diff -u llvm/test/Programs/TEST.nightly.report:1.9 llvm/test/Programs/TEST.nightly.report:1.10
--- llvm/test/Programs/TEST.nightly.report:1.9	Thu Aug 14 19:29:17 2003
+++ llvm/test/Programs/TEST.nightly.report	Fri Aug 15 11:26:16 2003
@@ -20,10 +20,12 @@
  ["GCCAS"    , "TEST-RESULT-compile: $WallTimeRE"],
  ["Bytecode" , 'TEST-RESULT-compile: *([0-9]+)'],
  ["Instrs"   , 'TEST-RESULT-compile: *([0-9]+).*Number of inst'],
- ["LLC"      , 'TEST-RESULT-llc-time: real\s*([.0-9m]+)'],
+ ["GCCAS"    , "TEST-RESULT-compile: $WallTimeRE"],
+ ["LLC"      , "TEST-RESULT-llc: $WallTimeRE"],
  [],
  ["NAT"      , 'TEST-RESULT-nat-time: real\s*([.0-9m]+)'],
  ["CBE"      , 'TEST-RESULT-cbe-time: real\s*([.0-9m]+)'],
+ ["LLC"      , 'TEST-RESULT-llc-time: real\s*([.0-9m]+)'],
  ["JIT"      , 'TEST-RESULT-jit-time: real\s*([.0-9m]+)'],
  [],
  ["MachCode" , 'TEST-RESULT-jit-machcode: *([0-9]+).*bytes of machine code'],




From lattner at cs.uiuc.edu  Fri Aug 15 11:30:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 11:30:01 2003
Subject: [llvm-commits] CVS: llvm/utils/NightlyTestTemplate.html
Message-ID: <200308151629.LAA07478@apoc.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTestTemplate.html updated: 1.8 -> 1.9

---
Log message:

Document new column, remove X86 specific stuff


---
Diffs of the changes:

Index: llvm/utils/NightlyTestTemplate.html
diff -u llvm/utils/NightlyTestTemplate.html:1.8 llvm/utils/NightlyTestTemplate.html:1.9
--- llvm/utils/NightlyTestTemplate.html:1.8	Sat Jun 21 15:09:01 2003
+++ llvm/utils/NightlyTestTemplate.html	Fri Aug 15 11:29:06 2003
@@ -126,11 +126,12 @@
 <li><a name="Bytecode">Bytecode - The size of the bytecode for the program
 <li><a name="Instrs">Instrs - The number of LLVM instructions in the
     compiled bytecode
-<li><a name="LLC">LLC - The time taken compile with LLC (the static X86 backend)
+<li><a name="LLC">LLC - The time taken compile with LLC (the static backend)
 <li><a name="NAT">NAT - The time taken to execute the program when compiled
     with GCC -O3.
 <li><a name="CBE">CBE - The time taken to execute the program after compilation
     through the C Backend.  If the diff fails, this a *.
+<li><a name="LLC">LLC - The time taken to run LLC compiled program
 <li><a name="JIT">JIT - How long does the program take to execute in the
     Just-In-Time compiler.
 <li><a name="MachCode">MachCode - The number of bytes of machine code




From brukman at cs.uiuc.edu  Fri Aug 15 12:53:02 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Aug 15 12:53:02 2003
Subject: [llvm-commits] CVS: llvm/include/Support/HashExtras.h
Message-ID: <200308151752.MAA29535@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

HashExtras.h updated: 1.6 -> 1.7

---
Log message:

Reordered includes to be consistent with the LLVM style.


---
Diffs of the changes:

Index: llvm/include/Support/HashExtras.h
diff -u llvm/include/Support/HashExtras.h:1.6 llvm/include/Support/HashExtras.h:1.7
--- llvm/include/Support/HashExtras.h:1.6	Mon Jun 16 19:35:55 2003
+++ llvm/include/Support/HashExtras.h	Fri Aug 15 12:52:02 2003
@@ -10,8 +10,8 @@
 #ifndef SUPPORT_HASHEXTRAS_H
 #define SUPPORT_HASHEXTRAS_H
 
-#include <string>
 #include "Support/hash_map"
+#include <string>
 
 // Cannot specialize hash template from outside of the std namespace.
 namespace HASH_NAMESPACE {




From brukman at cs.uiuc.edu  Fri Aug 15 13:04:03 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Aug 15 13:04:03 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
Message-ID: <200308151803.NAA04430@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

SparcV9CodeEmitter.cpp updated: 1.29 -> 1.30

---
Log message:

Now that the JIT memory manager allocates as many bytes as necessary rather than
rounding up to a page, we need to request (num instrs * 4) bytes. However, I
think that 64 bytes is overkill for the stub function.


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp
diff -u llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.29 llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.30
--- llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp:1.29	Fri Aug 15 11:15:28 2003
+++ llvm/lib/Target/Sparc/SparcV9CodeEmitter.cpp	Fri Aug 15 13:03:06 2003
@@ -373,7 +373,8 @@
 /// directly.
 ///
 uint64_t JITResolver::emitStubForFunction(Function *F) {
-  MCE.startFunctionStub(*F, 20);
+  // FIXME: 40 is not enough... but should be
+  MCE.startFunctionStub(*F, 64);
 
   DEBUG(std::cerr << "Emitting stub at addr: 0x" 
                   << std::hex << MCE.getCurrentPCValue() << "\n");




From lattner at cs.uiuc.edu  Fri Aug 15 13:42:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 13:42:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile.programs
Message-ID: <200308151841.NAA09756@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.83 -> 1.84

---
Log message:

Allow projects to specify their own TEST.*.Makefile's


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.83 llvm/test/Programs/Makefile.programs:1.84
--- llvm/test/Programs/Makefile.programs:1.83	Thu Aug  7 14:37:22 2003
+++ llvm/test/Programs/Makefile.programs	Fri Aug 15 13:41:40 2003
@@ -486,7 +486,8 @@
 # test.<testname>.%  given input from Output/%.llvm.bc
 #
 ifdef TEST
-TestMakefile := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).Makefile)
+TestMakefile := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).Makefile) \
+                $(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).Makefile)
 ifneq ($(TestMakefile),)
 -include $(TestMakefile)
 else




From lattner at cs.uiuc.edu  Fri Aug 15 13:49:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 13:49:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/
Message-ID: <200308151848.NAA09790@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden:


---
Log message:

Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/MultiSource/Olden added to the repository


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Fri Aug 15 13:49:10 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 13:49:10 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/
Message-ID: <200308151848.NAA09800@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat:


---
Log message:

Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/MultiSource/McCat added to the repository


---
Diffs of the changes:



From lattner at cs.uiuc.edu  Fri Aug 15 13:49:17 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 13:49:17 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/
Message-ID: <200308151848.NAA09805@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist:


---
Log message:

Directory /home/vadve/vadve/Research/DynOpt/CVSRepository/llvm/test/Programs/MultiSource/Ptrdist added to the repository


---
Diffs of the changes:



From gaeke at cs.uiuc.edu  Fri Aug 15 13:52:01 2003
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Fri Aug 15 13:52:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.reopt.Makefile
Message-ID: <200308151851.NAA27816@trinity.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.reopt.Makefile added (r1.1)

---
Log message:

The new, improved reoptimizer test makefile


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.reopt.Makefile
diff -c /dev/null llvm/test/Programs/TEST.reopt.Makefile:1.1
*** /dev/null	Fri Aug 15 13:51:39 2003
--- llvm/test/Programs/TEST.reopt.Makefile	Fri Aug 15 13:51:28 2003
***************
*** 0 ****
--- 1,66 ----
+ ##===- test/Programs/TEST.reopt.Makefile -------------------*- Makefile -*-===##
+ #
+ # Do a reoptimizer build for each program; then run the program. The expected
+ # output is 1) any debug output the reoptimizer outputs, if its debug flags
+ #              are set
+ #           2) no core dumps unless the unaltered program also dumps core
+ #           3) same output as unaltered program
+ #
+ # Admittedly this is pretty weak but it serves as a kind of "hello
+ # world"-level test.
+ #
+ ##===----------------------------------------------------------------------===##
+ 
+ TESTNAME = $*
+ 
+ # Libraries that contain the Reoptimizer itself
+ REOPTIMIZER_LIBS = $(DESTLIBCURRENT)/firstTrigger.o \
+ 	$(DESTLIBCURRENT)/tracecache.o $(DESTLIBCURRENT)/mapinfo.o \
+ 	$(DESTLIBCURRENT)/scratchmemory.o
+ 
+ # Libraries that contain common LLVM code the Reoptimizer depends on
+ REOPTIMIZER_LLVM_SUPPORT_LIBS = $(DESTLIBCURRENT)/libscalaropts.a \
+ 	$(DESTLIBCURRENT)/libtransformutils.a $(DESTLIBCURRENT)/vmcore.o \
+ 	$(DESTLIBCURRENT)/libsupport.a $(DESTLIBCURRENT)/bcreader.o \
+ 	$(DESTLIBCURRENT)/libanalysis.a
+ 
+ # Solaris libraries that the Reoptimizer depends on
+ REOPTIMIZER_SOLARIS_SUPPORT_LIBS = -lcpc -lm -lrt -lmalloc
+ 
+ # Libraries that should be checked for freshness when doing 
+ # Reoptimizer tests (http://www.goodegg.com/eggdating.html)
+ REOPTIMIZER_LIBDEPS = $(REOPTIMIZER_LIBS) $(REOPTIMIZER_LLVM_SUPPORT_LIBS)
+ 
+ # Things that need to be added to the link line when linking a
+ # program with the Reoptimizer
+ REOPTIMIZER_LDADD = $(REOPTIMIZER_LIBS) $(REOPTIMIZER_LLVM_SUPPORT_LIBS) \
+ 	$(REOPTIMIZER_SOLARIS_SUPPORT_LIBS)
+ 
+ .PRECIOUS: Output/%.out-reopt-llc
+ 
+ $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
+ test.$(TEST).%: Output/%.out-reopt-llc
+ 	@echo "========================================="
+ 
+ # 1. Run the necessary opt passes over the bytecode, then...
+ # 1a. Compile it with LLC, using the SPARC backend's special option to
+ # insert the mapping information.  We use -disable-sched to reduce
+ # compile times significantly.
+ $(PROGRAMS_TO_TEST:%=Output/%.reopt-llc.s): \
+ Output/%.reopt-llc.s: Output/%.llvm.bc
+ 	@echo "========================================="
+ 	@echo "Compiling Reoptimizer version of '$(TESTNAME)'"
+ 	-$(LOPT) -q -inline -lowerswitch -branch-combine -emitfuncs -instloops $< | $(LLC) $(LLCFLAGS) -disable-sched -f -emitmaps -o $@
+ 
+ # 2. Link the instrumented binary with the necessary parts of the
+ # compiler.
+ $(PROGRAMS_TO_TEST:%=Output/%.reopt-llc): \
+ Output/%.reopt-llc: Output/%.reopt-llc.s $(REOPTIMIZER_LIBDEPS)
+ 	-$(CXX) $(CFLAGS) $< -o $@ $(REOPTIMIZER_LDADD)
+ 
+ # 3. Run the reoptimized version.
+ $(PROGRAMS_TO_TEST:%=Output/%.out-reopt-llc): \
+ Output/%.out-reopt-llc: Output/%.reopt-llc
+ 	@echo "Running Reoptimizer version of '$(TESTNAME)'"
+ 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+ 




From lattner at cs.uiuc.edu  Fri Aug 15 13:55:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 13:55:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Burg/.cvsignore
Message-ID: <200308151854.NAA09898@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Burg:

.cvsignore added (r1.1)

---
Log message:

Tell CVS to stop telling us we have new files


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Burg/.cvsignore
diff -c /dev/null llvm/test/Programs/MultiSource/Burg/.cvsignore:1.1
*** /dev/null	Fri Aug 15 13:54:04 2003
--- llvm/test/Programs/MultiSource/Burg/.cvsignore	Fri Aug 15 13:53:54 2003
***************
*** 0 ****
--- 1,2 ----
+ y.tab.c
+ y.tab.h




From lattner at cs.uiuc.edu  Fri Aug 15 13:56:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 13:56:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/Makefile
Message-ID: <200308151855.NAA10295@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat:

Makefile added (r1.1)

---
Log message:

Initial checkin of makefile for new directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/Makefile
diff -c /dev/null llvm/test/Programs/MultiSource/McCat/Makefile:1.1
*** /dev/null	Fri Aug 15 13:55:14 2003
--- llvm/test/Programs/MultiSource/McCat/Makefile	Fri Aug 15 13:55:04 2003
***************
*** 0 ****
--- 1,6 ----
+ # MultiSource/McCat Makefile:  Build all subdirectories automatically
+ 
+ LEVEL = ../../../..
+ PARALLEL_DIRS  := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */))))
+ 
+ include ${LEVEL}/Makefile.common




From lattner at cs.uiuc.edu  Fri Aug 15 13:56:08 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 13:56:08 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/Makefile
Message-ID: <200308151855.NAA10302@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden:

Makefile added (r1.1)

---
Log message:

Initial checkin of makefile for new directory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/Makefile
diff -c /dev/null llvm/test/Programs/MultiSource/Olden/Makefile:1.1
*** /dev/null	Fri Aug 15 13:55:15 2003
--- llvm/test/Programs/MultiSource/Olden/Makefile	Fri Aug 15 13:55:05 2003
***************
*** 0 ****
--- 1,6 ----
+ # MultiSource/Olden Makefile:  Build all subdirectories automatically
+ 
+ LEVEL = ../../../..
+ PARALLEL_DIRS  := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */))))
+ 
+ include ${LEVEL}/Makefile.common




From lattner at cs.uiuc.edu  Fri Aug 15 13:56:15 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 13:56:15 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/Makefile
Message-ID: <200308151855.NAA10309@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist:

Makefile added (r1.1)

---
Log message:

Initial checkin of makefile for new directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Ptrdist/Makefile
diff -c /dev/null llvm/test/Programs/MultiSource/Ptrdist/Makefile:1.1
*** /dev/null	Fri Aug 15 13:55:16 2003
--- llvm/test/Programs/MultiSource/Ptrdist/Makefile	Fri Aug 15 13:55:06 2003
***************
*** 0 ****
--- 1,6 ----
+ # MultiSource/Ptrdist Makefile:  Build all subdirectories automatically
+ 
+ LEVEL = ../../../..
+ PARALLEL_DIRS  := $(filter-out %-disabled/, $(sort $(filter-out CVS/, $(wildcard */))))
+ 
+ include ${LEVEL}/Makefile.common




From lattner at cs.uiuc.edu  Fri Aug 15 14:00:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:00:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile
Message-ID: <200308151859.NAA12869@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/01-qbsort:

Makefile updated: 1.2 -> 1.3

---
Log message:

Changes to handle relocation of test to a new subdirectory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile:1.2 llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile:1.3
--- llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile:1.2	Sun Jun  1 21:02:04 2003
+++ llvm/test/Programs/MultiSource/McCat/01-qbsort/Makefile	Fri Aug 15 13:59:12 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = qbsort
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 STDIN_FILENAME = benchmark.in3
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:00:09 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:00:09 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/03-testtrie/Makefile
Message-ID: <200308151859.NAA12876@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/03-testtrie:

Makefile updated: 1.2 -> 1.3

---
Log message:

Changes to handle relocation of test to a new subdirectory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/03-testtrie/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/03-testtrie/Makefile:1.2 llvm/test/Programs/MultiSource/McCat/03-testtrie/Makefile:1.3
--- llvm/test/Programs/MultiSource/McCat/03-testtrie/Makefile:1.2	Sun Jun  1 21:02:05 2003
+++ llvm/test/Programs/MultiSource/McCat/03-testtrie/Makefile	Fri Aug 15 13:59:14 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = testtrie
 LDFLAGS = -lm
 RUN_OPTIONS += testtrie.in2
 #STDIN_FILENAME = benchmark.in3
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:00:16 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:00:16 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile
Message-ID: <200308151859.NAA12883@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/04-bisect:

Makefile updated: 1.3 -> 1.4

---
Log message:

Changes to handle relocation of test to a new subdirectory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile:1.3 llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile:1.4
--- llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile:1.3	Sun Jun  1 21:02:07 2003
+++ llvm/test/Programs/MultiSource/McCat/04-bisect/Makefile	Fri Aug 15 13:59:15 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = bisect
 LDFLAGS = -lm
 #RUN_OPTIONS += 
@@ -7,5 +7,4 @@
 # This program is adversely effected by the underlying precision of the machine
 PROGRAM_IS_NONDETERMINISTIC = 1
 
-include ../Makefile.multisrc
-
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc




From lattner at cs.uiuc.edu  Fri Aug 15 14:00:23 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:00:23 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/05-eks/Makefile
Message-ID: <200308151859.NAA12891@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/05-eks:

Makefile updated: 1.2 -> 1.3

---
Log message:

Changes to handle relocation of test to a new subdirectory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/05-eks/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/05-eks/Makefile:1.2 llvm/test/Programs/MultiSource/McCat/05-eks/Makefile:1.3
--- llvm/test/Programs/MultiSource/McCat/05-eks/Makefile:1.2	Sun Jun  1 21:02:08 2003
+++ llvm/test/Programs/MultiSource/McCat/05-eks/Makefile	Fri Aug 15 13:59:16 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = eks
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 #STDIN_FILENAME = bnchmrk.in1
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:00:30 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:00:30 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/08-main/Makefile
Message-ID: <200308151859.NAA12898@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/08-main:

Makefile updated: 1.3 -> 1.4

---
Log message:

Changes to handle relocation of test to a new subdirectory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/08-main/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/08-main/Makefile:1.3 llvm/test/Programs/MultiSource/McCat/08-main/Makefile:1.4
--- llvm/test/Programs/MultiSource/McCat/08-main/Makefile:1.3	Wed Aug  6 15:42:28 2003
+++ llvm/test/Programs/MultiSource/McCat/08-main/Makefile	Fri Aug 15 13:59:19 2003
@@ -1,6 +1,6 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = main
 LDFLAGS = -lm
 
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:00:38 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:00:38 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/09-vor/Makefile
Message-ID: <200308151859.NAA12905@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/09-vor:

Makefile updated: 1.2 -> 1.3

---
Log message:

Changes to handle relocation of test to a new subdirectory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/09-vor/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/09-vor/Makefile:1.2 llvm/test/Programs/MultiSource/McCat/09-vor/Makefile:1.3
--- llvm/test/Programs/MultiSource/McCat/09-vor/Makefile:1.2	Sun Jun  1 21:02:10 2003
+++ llvm/test/Programs/MultiSource/McCat/09-vor/Makefile	Fri Aug 15 13:59:19 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = vor
 STDIN_FILENAME = vor.in3
 LDFLAGS = -lm
 
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:00:45 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:00:45 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile
Message-ID: <200308151859.NAA12927@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/17-bintr:

Makefile updated: 1.2 -> 1.3

---
Log message:

Changes to handle relocation of test to a new subdirectory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile:1.2 llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile:1.3
--- llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile:1.2	Sun Jun  1 21:02:11 2003
+++ llvm/test/Programs/MultiSource/McCat/17-bintr/Makefile	Fri Aug 15 13:59:19 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = bintr
 LDFLAGS = -lm
 #RUN_OPTIONS += 
 STDIN_FILENAME = bnchmrk.in1
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:00:52 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:00:52 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/15-trie/Makefile
Message-ID: <200308151859.NAA12920@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/15-trie:

Makefile updated: 1.1 -> 1.2

---
Log message:

Changes to handle relocation of test to a new subdirectory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/15-trie/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/15-trie/Makefile:1.1 llvm/test/Programs/MultiSource/McCat/15-trie/Makefile:1.2
--- llvm/test/Programs/MultiSource/McCat/15-trie/Makefile:1.1	Mon May 12 13:30:53 2003
+++ llvm/test/Programs/MultiSource/McCat/15-trie/Makefile	Fri Aug 15 13:59:19 2003
@@ -1,6 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = trie
 LDFLAGS = -lm
 RUN_OPTIONS += trie.in1
-include ../Makefile.multisrc
+
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:01:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:01:00 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/12-IOtest/Makefile
Message-ID: <200308151859.NAA12913@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/12-IOtest:

Makefile updated: 1.1 -> 1.2

---
Log message:

Changes to handle relocation of test to a new subdirectory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/12-IOtest/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/12-IOtest/Makefile:1.1 llvm/test/Programs/MultiSource/McCat/12-IOtest/Makefile:1.2
--- llvm/test/Programs/MultiSource/McCat/12-IOtest/Makefile:1.1	Mon May 12 13:47:22 2003
+++ llvm/test/Programs/MultiSource/McCat/12-IOtest/Makefile	Fri Aug 15 13:59:19 2003
@@ -1,6 +1,6 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = iotest
 #LDFLAGS = -lm
 #RUN_OPTIONS += trie.in1
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:01:07 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:01:07 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/McCat/18-imp/Makefile
Message-ID: <200308151859.NAA12934@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/McCat/18-imp:

Makefile updated: 1.1 -> 1.2

---
Log message:

Changes to handle relocation of test to a new subdirectory



---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/McCat/18-imp/Makefile
diff -u llvm/test/Programs/MultiSource/McCat/18-imp/Makefile:1.1 llvm/test/Programs/MultiSource/McCat/18-imp/Makefile:1.2
--- llvm/test/Programs/MultiSource/McCat/18-imp/Makefile:1.1	Mon May 12 13:06:33 2003
+++ llvm/test/Programs/MultiSource/McCat/18-imp/Makefile	Fri Aug 15 13:59:19 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = imp
 RUN_OPTIONS += sg01.imp
 LDFLAGS := -lm
 
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:03:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:03:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile
Message-ID: <200308151902.OAA15252@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist/anagram:

Makefile updated: 1.3 -> 1.4

---
Log message:

Changes to handle relocation of test cases to new subdirectory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile
diff -u llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile:1.3 llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile:1.4
--- llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile:1.3	Mon Jul 21 18:05:15 2003
+++ llvm/test/Programs/MultiSource/Ptrdist/anagram/Makefile	Fri Aug 15 14:02:48 2003
@@ -1,11 +1,11 @@
-LEVEL=../../../..
+LEVEL=../../../../..
 PROG = anagram
 #OBJS = anagram.o
 RUN_OPTIONS = words 
 STDIN_FILENAME = input.OUT
 
-include ../Makefile.multisrc
-
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+ 
 #test:
 #	$(SIM) ./anagram words < input.in > FOO
 #	$(DIFF) FOO input.OUT




From lattner at cs.uiuc.edu  Fri Aug 15 14:04:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:04:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile
Message-ID: <200308151903.OAA15372@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist/bc:

Makefile updated: 1.2 -> 1.3

---
Log message:

Changes to handle relocation of test cases to new subdirectory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile
diff -u llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile:1.2 llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile:1.3
--- llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile:1.2	Sun Jun  1 21:02:13 2003
+++ llvm/test/Programs/MultiSource/Ptrdist/bc/Makefile	Fri Aug 15 14:02:50 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = bc
 OBJS = scan.o util.o main.o number.o storage.o load.o execute.o bc.o global.o
 STDIN_FILENAME = primes.b
 
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:04:11 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:04:11 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/yacr2/Makefile
Message-ID: <200308151903.OAA15387@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist/yacr2:

Makefile updated: 1.1 -> 1.2

---
Log message:

Changes to handle relocation of test cases to new subdirectory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Ptrdist/yacr2/Makefile
diff -u llvm/test/Programs/MultiSource/Ptrdist/yacr2/Makefile:1.1 llvm/test/Programs/MultiSource/Ptrdist/yacr2/Makefile:1.2
--- llvm/test/Programs/MultiSource/Ptrdist/yacr2/Makefile:1.1	Tue Nov  5 12:51:05 2002
+++ llvm/test/Programs/MultiSource/Ptrdist/yacr2/Makefile	Fri Aug 15 14:02:51 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = yacr2
 CPPFLAGS = -DTODD
 RUN_OPTIONS += input2.in
 
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:04:19 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:04:19 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/ks/Makefile
Message-ID: <200308151903.OAA15382@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist/ks:

Makefile updated: 1.5 -> 1.6

---
Log message:

Changes to handle relocation of test cases to new subdirectory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Ptrdist/ks/Makefile
diff -u llvm/test/Programs/MultiSource/Ptrdist/ks/Makefile:1.5 llvm/test/Programs/MultiSource/Ptrdist/ks/Makefile:1.6
--- llvm/test/Programs/MultiSource/Ptrdist/ks/Makefile:1.5	Wed Aug  6 15:42:31 2003
+++ llvm/test/Programs/MultiSource/Ptrdist/ks/Makefile	Fri Aug 15 14:02:50 2003
@@ -1,7 +1,7 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = ks
 #OBJS = KS-1.o KS-2.o
 RUN_OPTIONS += KL-4.in
 
-include ../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 




From lattner at cs.uiuc.edu  Fri Aug 15 14:04:27 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:04:27 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Ptrdist/ft/Makefile
Message-ID: <200308151903.OAA15377@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Ptrdist/ft:

Makefile updated: 1.4 -> 1.5

---
Log message:

Changes to handle relocation of test cases to new subdirectory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Ptrdist/ft/Makefile
diff -u llvm/test/Programs/MultiSource/Ptrdist/ft/Makefile:1.4 llvm/test/Programs/MultiSource/Ptrdist/ft/Makefile:1.5
--- llvm/test/Programs/MultiSource/Ptrdist/ft/Makefile:1.4	Mon Jul 21 18:05:21 2003
+++ llvm/test/Programs/MultiSource/Ptrdist/ft/Makefile	Fri Aug 15 14:02:50 2003
@@ -1,5 +1,5 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 PROG = ft
 RUN_OPTIONS +=  1500 100000
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 
-include ../Makefile.multisrc




From lattner at cs.uiuc.edu  Fri Aug 15 14:06:19 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:06:19 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/bh/Makefile
Message-ID: <200308151905.OAA15934@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/bh:

Makefile updated: 1.8 -> 1.9

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/bh/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/bh/Makefile:1.8 llvm/test/Programs/MultiSource/Olden/bh/Makefile:1.9
--- llvm/test/Programs/MultiSource/Olden/bh/Makefile:1.8	Fri Jun 20 18:03:19 2003
+++ llvm/test/Programs/MultiSource/Olden/bh/Makefile	Fri Aug 15 14:05:31 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG     = bh
 CPPFLAGS = -DTORONTO
@@ -6,5 +6,5 @@
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = 50000 30
 endif
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 
-include	../Makefile.multisrc




From lattner at cs.uiuc.edu  Fri Aug 15 14:06:27 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:06:27 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/bisort/Makefile
Message-ID: <200308151905.OAA15942@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/bisort:

Makefile updated: 1.4 -> 1.5

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/bisort/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/bisort/Makefile:1.4 llvm/test/Programs/MultiSource/Olden/bisort/Makefile:1.5
--- llvm/test/Programs/MultiSource/Olden/bisort/Makefile:1.4	Fri Jun 20 18:03:21 2003
+++ llvm/test/Programs/MultiSource/Olden/bisort/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG     = bisort
 CPPFLAGS = -DTORONTO
@@ -9,5 +9,5 @@
 else
 RUN_OPTIONS = 700000
 endif
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 
-include	../Makefile.multisrc




From lattner at cs.uiuc.edu  Fri Aug 15 14:06:35 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:06:35 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/em3d/Makefile
Message-ID: <200308151905.OAA15949@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/em3d:

Makefile updated: 1.4 -> 1.5

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/em3d/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/em3d/Makefile:1.4 llvm/test/Programs/MultiSource/Olden/em3d/Makefile:1.5
--- llvm/test/Programs/MultiSource/Olden/em3d/Makefile:1.4	Fri Aug  1 18:45:55 2003
+++ llvm/test/Programs/MultiSource/Olden/em3d/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG       = em3d
 CPPFLAGS   = -DTORONTO
@@ -8,4 +8,5 @@
 RUN_OPTIONS = 1024 1000 125
 endif
 
-include	../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+




From lattner at cs.uiuc.edu  Fri Aug 15 14:06:44 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:06:44 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/health/Makefile
Message-ID: <200308151905.OAA15956@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/health:

Makefile updated: 1.11 -> 1.12

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/health/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/health/Makefile:1.11 llvm/test/Programs/MultiSource/Olden/health/Makefile:1.12
--- llvm/test/Programs/MultiSource/Olden/health/Makefile:1.11	Fri Jun 20 18:03:22 2003
+++ llvm/test/Programs/MultiSource/Olden/health/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG     = health
 CPPFLAGS = -DTORONTO
@@ -8,5 +8,5 @@
 else
 RUN_OPTIONS = 9 20 1
 endif
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 
-include	../Makefile.multisrc




From lattner at cs.uiuc.edu  Fri Aug 15 14:06:53 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:06:53 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/mst/Makefile
Message-ID: <200308151905.OAA15963@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/mst:

Makefile updated: 1.10 -> 1.11

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/mst/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/mst/Makefile:1.10 llvm/test/Programs/MultiSource/Olden/mst/Makefile:1.11
--- llvm/test/Programs/MultiSource/Olden/mst/Makefile:1.10	Mon Jul 21 14:12:35 2003
+++ llvm/test/Programs/MultiSource/Olden/mst/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG       = mst
 CPPFLAGS   = -DTORONTO
@@ -9,4 +9,5 @@
 RUN_OPTIONS = 500
 endif
 
-include	../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+




From lattner at cs.uiuc.edu  Fri Aug 15 14:07:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:07:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/tsp/Makefile
Message-ID: <200308151905.OAA15991@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/tsp:

Makefile updated: 1.3 -> 1.4

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/tsp/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/tsp/Makefile:1.3 llvm/test/Programs/MultiSource/Olden/tsp/Makefile:1.4
--- llvm/test/Programs/MultiSource/Olden/tsp/Makefile:1.3	Mon Jun 16 10:51:30 2003
+++ llvm/test/Programs/MultiSource/Olden/tsp/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,8 +1,9 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG     = tsp
 CPPFLAGS = -DTORONTO
 LDFLAGS  = -lm
 RUN_OPTIONS = 1024000
 
-include	../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+




From lattner at cs.uiuc.edu  Fri Aug 15 14:07:10 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:07:10 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/perimeter/Makefile
Message-ID: <200308151905.OAA15970@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/perimeter:

Makefile updated: 1.8 -> 1.9

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/perimeter/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/perimeter/Makefile:1.8 llvm/test/Programs/MultiSource/Olden/perimeter/Makefile:1.9
--- llvm/test/Programs/MultiSource/Olden/perimeter/Makefile:1.8	Mon Jul 21 14:12:25 2003
+++ llvm/test/Programs/MultiSource/Olden/perimeter/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG     = perimeter
 CPPFLAGS = -DTORONTO
@@ -9,4 +9,5 @@
 RUN_OPTIONS = 4
 endif
 
-include	../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+




From lattner at cs.uiuc.edu  Fri Aug 15 14:07:19 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:07:19 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/power/Makefile
Message-ID: <200308151905.OAA15977@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/power:

Makefile updated: 1.1 -> 1.2

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/power/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/power/Makefile:1.1 llvm/test/Programs/MultiSource/Olden/power/Makefile:1.2
--- llvm/test/Programs/MultiSource/Olden/power/Makefile:1.1	Wed Jan 23 15:33:12 2002
+++ llvm/test/Programs/MultiSource/Olden/power/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,7 +1,8 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG     = power
 CPPFLAGS = -DTORONTO
 LDFLAGS  = -lm
 
-include	../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+




From lattner at cs.uiuc.edu  Fri Aug 15 14:07:28 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:07:28 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/voronoi/Makefile
Message-ID: <200308151905.OAA15998@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/voronoi:

Makefile updated: 1.7 -> 1.8

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/voronoi/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/voronoi/Makefile:1.7 llvm/test/Programs/MultiSource/Olden/voronoi/Makefile:1.8
--- llvm/test/Programs/MultiSource/Olden/voronoi/Makefile:1.7	Fri Jun 20 18:03:23 2003
+++ llvm/test/Programs/MultiSource/Olden/voronoi/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,4 +1,4 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG     = voronoi
 INCLUDES = defines.h
@@ -11,4 +11,5 @@
 # This program is adversely effected by the underlying precision of the machine
 PROGRAM_IS_NONDETERMINISTIC = 1
 
-include	../Makefile.multisrc
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
+




From lattner at cs.uiuc.edu  Fri Aug 15 14:07:36 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:07:36 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Olden/treeadd/Makefile
Message-ID: <200308151905.OAA15984@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/Olden/treeadd:

Makefile updated: 1.7 -> 1.8

---
Log message:

Relocate tests into an Olden directory


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Olden/treeadd/Makefile
diff -u llvm/test/Programs/MultiSource/Olden/treeadd/Makefile:1.7 llvm/test/Programs/MultiSource/Olden/treeadd/Makefile:1.8
--- llvm/test/Programs/MultiSource/Olden/treeadd/Makefile:1.7	Mon Jun 16 10:51:28 2003
+++ llvm/test/Programs/MultiSource/Olden/treeadd/Makefile	Fri Aug 15 14:05:33 2003
@@ -1,8 +1,8 @@
-LEVEL = ../../../..
+LEVEL = ../../../../..
 
 PROG       = treeadd
 CPPFLAGS   = -DTORONTO
 LDFLAGS    = 
 RUN_OPTIONS = 22
+include $(LEVEL)/test/Programs/MultiSource/Makefile.multisrc
 
-include	../Makefile.multisrc




From lattner at cs.uiuc.edu  Fri Aug 15 14:08:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:08:00 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/README.txt
Message-ID: <200308151906.OAA16018@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource:

README.txt updated: 1.2 -> 1.3

---
Log message:

Remove obsolete numbers


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/README.txt
diff -u llvm/test/Programs/MultiSource/README.txt:1.2 llvm/test/Programs/MultiSource/README.txt:1.3
--- llvm/test/Programs/MultiSource/README.txt:1.2	Sun Mar 31 13:14:59 2002
+++ llvm/test/Programs/MultiSource/README.txt	Fri Aug 15 14:06:28 2003
@@ -14,77 +14,3 @@
 wc *.[ch]
 cd -
 end
--------------------- Olden-bh --------------------
-      25      46     320 args.c
-      27     111     821 code.h
-     248     767    6111 defs.h
-    1240    4569   33748 newbh.c
-     119     357    2354 stdinc.h
-      77     170    1137 util.c
-     303    1172    7431 vectmath.h
-      44     198    1264 walksub.c
-    2083    7390   53186 total
--------------------- Olden-bisort --------------------
-      36      76     512 args.c
-     280     649    5422 bitonic.c
-      19      44     349 node.h
-      13      30     269 proc.h
-     348     799    6552 total
--------------------- Olden-em3d --------------------
-      66     127     972 args.c
-      60     142    1424 em3d.c
-      57     181    1261 em3d.h
-      52      90    1047 main.c
-     347     953    9763 make_graph.c
-      13      41     253 make_graph.h
-      63     132    1015 util.c
-      25      92     593 util.h
-     683    1758   16328 total
--------------------- Olden-health --------------------
-      28      71     693 args.c
-     298     910    7841 health.c
-     100     262    2807 health.h
-      47     123    1113 list.c
-      30      70     528 poisson.c
-     503    1436   12982 total
--------------------- Olden-mst --------------------
-      16      38     252 args.c
-      97     248    2038 hash.c
-      20      61     482 hash.h
-     155     364    3386 main.c
-     117     284    2465 makegraph.c
-      23      55     427 mst.h
-     428    1050    9050 total
--------------------- Olden-perimeter --------------------
-      49      88     714 args.c
-     258     516    5604 main.c
-     123     256    3112 maketree.c
-      54     118     995 perimeter.h
-     484     978   10425 total
--------------------- Olden-power --------------------
-      87     222    1566 build.c
-     331     786    7498 compute.c
-     106     329    3290 main.c
-      91     267    2003 power.h
-     615    1604   14357 total
--------------------- Olden-treeadd --------------------
-      49      92     732 args.c
-     144     322    2817 node.c
-      27      76     590 par-alloc.c
-      25      45     318 tree.h
-     245     535    4457 total
--------------------- Olden-tsp --------------------
-      47      77     520 args.c
-     124     323    2974 build.c
-      57     131    1138 main.c
-     292     943    6715 tsp.c
-      58     184    1283 tsp.h
-     578    1658   12630 total
--------------------- Olden-voronoi --------------------
-      41      91     615 args.c
-     123     390    3164 defines.h
-     712    1880   17464 newvor.c
-     157     472    4222 output.c
-      69     235    1511 vector.c
-    1102    3068   26976 total
-




From lattner at cs.uiuc.edu  Fri Aug 15 14:10:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:10:01 2003
Subject: [llvm-commits] CVS: llvm/www/www-index.html
Message-ID: <200308151909.OAA22516@tank.cs.uiuc.edu>


Changes in directory llvm/www:

www-index.html updated: 1.42 -> 1.43

---
Log message:

Add link to the new status update so people know we're not just slacking off


---
Diffs of the changes:

Index: llvm/www/www-index.html
diff -u llvm/www/www-index.html:1.42 llvm/www/www-index.html:1.43
--- llvm/www/www-index.html:1.42	Fri Aug  1 10:48:17 2003
+++ llvm/www/www-index.html	Fri Aug 15 14:09:38 2003
@@ -232,9 +232,14 @@
                 <td>
                 <table border="0">
                     <tr>
+                        <td valign="top"><b>Aug&nbsp;15,&nbsp;2003</b></td>
+                        <td valign="top">-</td>
+                        <td valign="top">Added a <a href="http://mail.cs.uiuc.edu/pipermail/llvmdev/2003-August/000448.html">status update</a>.</td>
+                    </tr>
+                    <tr>
                         <td valign="top"><b>Jun&nbsp;26,&nbsp;2003</b></td>
                         <td valign="top">-</td>
-                        <td valign="top">Added a new <a href="http://mail.cs.uiuc.edu/pipermail/llvmdev/2003-June/000416.html">status update</a>.</td>
+                        <td valign="top">Added a <a href="http://mail.cs.uiuc.edu/pipermail/llvmdev/2003-June/000416.html">status update</a>.</td>
                     </tr>
                     <tr>
                         <td valign="top"><b>May&nbsp;21,&nbsp;2003</b></td>




From brukman at cs.uiuc.edu  Fri Aug 15 14:12:02 2003
From: brukman at cs.uiuc.edu (Michael Brukman)
Date: Fri Aug 15 14:12:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/GenerateReport.pl
Message-ID: <200308151911.OAA27882@trinity.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

GenerateReport.pl updated: 1.10 -> 1.11

---
Log message:

Center headers.


---
Diffs of the changes:

Index: llvm/test/Programs/GenerateReport.pl
diff -u llvm/test/Programs/GenerateReport.pl:1.10 llvm/test/Programs/GenerateReport.pl:1.11
--- llvm/test/Programs/GenerateReport.pl:1.10	Fri Jun 20 18:01:51 2003
+++ llvm/test/Programs/GenerateReport.pl	Fri Aug 15 14:11:02 2003
@@ -87,7 +87,7 @@
   my $Col = 0;
   for $Row (@Fields) {
     if (scalar(@$Row)) {            # An actual value to read?
-      if (ref ($Row->[1])) {          # Code to be executed?
+      if (ref ($Row->[1])) {        # Code to be executed?
         push @RowValues, &{$Row->[1]}(\@RowValues, $Col);
       } else {                      # Field to be read...
         $Record =~ m/$Row->[1]/;
@@ -151,7 +151,7 @@
   print "<tr bgcolor=#FFCC99>\n";
   map {
     print "<td bgcolor='#DDAA77' width='1'></td>";
-    $_ = "<b><a href=\"#$_\">$_</a></b>"
+    $_ = "<center><b><a href=\"#$_\">$_</a></b></center>"
       if $_ ne "|"; printCell $_
   } @Header;
   print "<td bgcolor='#DDAA77' width='1'></td>";




From lattner at cs.uiuc.edu  Fri Aug 15 14:25:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 14:25:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile.programs
Message-ID: <200308151924.OAA16888@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.84 -> 1.85

---
Log message:

Clean out reoptimizer specific stuff that has been moved to TEST.reopt.Makefile!
Look at all of the -'s


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.84 llvm/test/Programs/Makefile.programs:1.85
--- llvm/test/Programs/Makefile.programs:1.84	Fri Aug 15 13:41:40 2003
+++ llvm/test/Programs/Makefile.programs	Fri Aug 15 14:24:38 2003
@@ -45,7 +45,6 @@
 .PRECIOUS: Output/%.llvm Output/%.native Output/%.llc Output/%.llc.s
 .PRECIOUS: Output/%.cbe Output/%.cbe.c Output/%.llvm.bc
 .PRECIOUS: Output/%.linked.bc 
-.PRECIOUS: Output/%.run.bc Output/%.run.s Output/%.tracing Output/%.trace
 
 PROGDIR = $(LEVEL)/test/Programs
 
@@ -90,12 +89,6 @@
 LLCCODEGEN := $(addsuffix .llc.s,   $(PREFIXED_PROGRAMS_TO_TEST))
 CBECODEGEN := $(addsuffix .cbe,     $(PREFIXED_PROGRAMS_TO_TEST))
 
-#programs generated for tracing framework
-LLCBYTECODE := $(addsuffix .llc.bc,   $(PREFIXED_PROGRAMS_TO_TEST))
-TRACINGCODEGEN := $(addsuffix .run.bc,   $(PREFIXED_PROGRAMS_TO_TEST))
-TRACINGLLCCODEGEN := $(addsuffix .run.s,   $(PREFIXED_PROGRAMS_TO_TEST))
-TRACINGEXECUTABLE := $(addsuffix .trace,   $(PREFIXED_PROGRAMS_TO_TEST))
-
 # Output produced by programs run
 GCCOUTPUT := $(addsuffix .ll,       $(addprefix Output/,$basename $(Source)))
 NATOUTPUT := $(addsuffix .out-nat,  $(PREFIXED_PROGRAMS_TO_TEST))
@@ -104,9 +97,6 @@
 LLCOUTPUT := $(addsuffix .out-llc,  $(PREFIXED_PROGRAMS_TO_TEST))
 CBEOUTPUT := $(addsuffix .out-cbe,  $(PREFIXED_PROGRAMS_TO_TEST))
 
-#output for tracing framework
-TRACINGOUTPUT := $(addsuffix .out-trace,  $(PREFIXED_PROGRAMS_TO_TEST))
-
 # Diffs of program runs vs the native program
 LLIDIFFS  := $(addsuffix .diff-lli, $(PREFIXED_PROGRAMS_TO_TEST))
 JITDIFFS  := $(addsuffix .diff-jit, $(PREFIXED_PROGRAMS_TO_TEST))
@@ -114,8 +104,8 @@
 CBEDIFFS  := $(addsuffix .diff-cbe, $(PREFIXED_PROGRAMS_TO_TEST))
 
 # Build Program outputs:
-.PRECIOUS: Output/%.out-lli Output/%.out-jit Output/%.out-llc Output/%.out-trace
-.PRECIOUS: Output/%.out-nat Output/%.out-cbe Output/%.llc.bc
+.PRECIOUS: Output/%.out-lli Output/%.out-jit Output/%.out-llc
+.PRECIOUS: Output/%.out-nat Output/%.out-cbe
 
 # Build diffs from the output...
 .PRECIOUS: Output/%.diff-lli Output/%.diff-jit
@@ -159,28 +149,12 @@
 .PRECIOUS: $(LLIOUTPUT) $(JITOUTPUT) $(LLCOUTPUT) $(CBEOUTPUT)
 endif
 
-ifdef GET_LLVM_TRACE
-all:: $(LLCBYTECODE)
-endif
-
 ifndef DISABLE_LLC
 all:: $(LLCCODEGEN)
 else
 DISABLE_LLC_DIFFS = 1
 endif
 
-ifdef GET_LLVM_TRACE
-all:: $(TRACINGCODEGEN)
-all:: $(TRACINGLLCCODEGEN)
-all:: $(TRACINGEXECUTABLE)
-all:: $(TRACINGOUTPUT)
-
-DISABLE_CBE = 1
-DISABLE_LLC_DIFFS = 1
-DISABLE_CBE_DIFFS = 1
-DISABLE_JIT = 1
-endif
-
 ifndef DISABLE_CBE
 all:: $(CBECODEGEN)
 else
@@ -282,20 +256,10 @@
 #
 # Compile a linked program to machine code with LLC.
 #
-
-$(PROGRAMS_TO_TEST:%=Output/%.llc.bc): \
-Output/%.llc.bc: Output/%.llvm.bc $(LOPT)
-	-$(LOPT) -f $< -inline -lowerswitch -branch-combine -emitfuncs -o $@
-
-ifndef GET_LLVM_TRACE
 $(PROGRAMS_TO_TEST:%=Output/%.llc.s): \
 Output/%.llc.s: Output/%.llvm.bc $(LLC)
 	-$(LLC) $(LLCFLAGS) -f $< -o $@
-else
-$(PROGRAMS_TO_TEST:%=Output/%.llc.s): \
-Output/%.llc.s: Output/%.llc.bc $(LLC)
-	-$(LLC) $(LLCFLAGS) -f $< -o $@
-endif
+
 
 ## Alternative command to run llc remotely on another machine:
 ## This is very useful when debugging:
@@ -307,33 +271,6 @@
 Output/%.llc: Output/%.llc.s
 	-$(CC) $(CFLAGS) $< $(LLCLIBS) $(LDFLAGS) -o $@
 
-$(PROGRAMS_TO_TEST:%=Output/%.trace.llc): \
-Output/%.trace.llc: Output/%.trace.llc.s
-	-$(CC) $(CFLAGS) $< $(LLCLIBS) $(TRACELIBS) -o $@
-
-##compile and create traced executables
-$(PROGRAMS_TO_TEST:%=Output/%.run.bc): \
-Output/%.run.bc: Output/%.llc.bc $(LOPT)
-	-$(LOPT) -instloops $< > $@
-
-$(PROGRAMS_TO_TEST:%=Output/%.run.s): \
-Output/%.run.s: Output/%.run.bc $(LLC)
-	-$(LLC) -f $< -o $@
-
-STATIC_TRACE_LIBS = ${DESTLIBDEBUG}/firstTrigger.o ${DESTLIBDEBUG}/tracecache.o\
-	${DESTLIBCURRENT}/mapinfo.o ${DESTLIBDEBUG}/scratchmemory.o
-
-DYNAMIC_TRACE_LIBS = ${DESTLIBCURRENT}/libscalaropts.a \
-	${DESTLIBCURRENT}/libtransformutils.a ${DESTLIBCURRENT}/vmcore.o \
-	${DESTLIBCURRENT}/libsupport.a ${DESTLIBCURRENT}/bcreader.o \
-	${DESTLIBCURRENT}/libanalysis.a
-
-OPTIMIZER_TRACE_LIBS = ${STATIC_TRACE_LIBS} $(DYNAMIC_TRACE_LIBS) -lcpc -lm -lrt -lmalloc
-
-$(PROGRAMS_TO_TEST:%=Output/%.trace): \
-Output/%.trace: Output/%.run.s $(STATIC_TRACE_LIBS) ${DYNAMIC__TRACE_LIBS}
-	-$(CXX) $(CFLAGS) $< -o $@ ${OPTIMIZER_TRACE_LIBS}
-
 
 #
 # Rules to execute the program
@@ -372,10 +309,6 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.out-cbe): \
 Output/%.out-cbe: Output/%.cbe
-	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
-
-$(PROGRAMS_TO_TEST:%=Output/%.out-trace): \
-Output/%.out-trace: Output/%.trace
 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
 
 endif




From brukman at cs.uiuc.edu  Fri Aug 15 14:31:01 2003
From: brukman at cs.uiuc.edu (Michael Brukman)
Date: Fri Aug 15 14:31:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.report
Message-ID: <200308151930.OAA27925@trinity.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.report updated: 1.10 -> 1.11

---
Log message:

* Fixed column order: group static measurements away from dynamic
* Added measurements for LLC static codegen time
* Clarified meaning of the JIT columns


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.report
diff -u llvm/test/Programs/TEST.nightly.report:1.10 llvm/test/Programs/TEST.nightly.report:1.11
--- llvm/test/Programs/TEST.nightly.report:1.10	Fri Aug 15 11:26:16 2003
+++ llvm/test/Programs/TEST.nightly.report	Fri Aug 15 14:30:28 2003
@@ -7,7 +7,7 @@
 # Sort by program name
 $SortCol = 0;
 
-my $WallTimeRE = '[A-Za-z0-9.: ]+\\(([0-9.]+) wall clock';
+my $WallTimeRE = "[A-Za-z0-9.: ]+\\(([0-9.]+) wall clock";
 
 # These are the columns for the report.  The first entry is the header for the
 # column, the second is the regex to use to match the value.  Empty list create
@@ -20,14 +20,12 @@
  ["GCCAS"    , "TEST-RESULT-compile: $WallTimeRE"],
  ["Bytecode" , 'TEST-RESULT-compile: *([0-9]+)'],
  ["Instrs"   , 'TEST-RESULT-compile: *([0-9]+).*Number of inst'],
- ["GCCAS"    , "TEST-RESULT-compile: $WallTimeRE"],
- ["LLC"      , "TEST-RESULT-llc: $WallTimeRE"],
+ ["LLC<br>compile" , "TEST-RESULT-llc: $WallTimeRE"],
+ ["JIT<br>codegen" , "TEST-RESULT-jit-comptime: $WallTimeRE"],
+ ["Machine<br>code", 'TEST-RESULT-jit-machcode: *([0-9]+).*bytes of machine code'],
  [],
- ["NAT"      , 'TEST-RESULT-nat-time: real\s*([.0-9m]+)'],
+ ["GCC"      , 'TEST-RESULT-nat-time: real\s*([.0-9m]+)'],
  ["CBE"      , 'TEST-RESULT-cbe-time: real\s*([.0-9m]+)'],
  ["LLC"      , 'TEST-RESULT-llc-time: real\s*([.0-9m]+)'],
- ["JIT"      , 'TEST-RESULT-jit-time: real\s*([.0-9m]+)'],
- [],
- ["MachCode" , 'TEST-RESULT-jit-machcode: *([0-9]+).*bytes of machine code'],
- ["CompTime" , "TEST-RESULT-jit-comptime: $WallTimeRE"]
+ ["JIT"      , 'TEST-RESULT-jit-time: real\s*([.0-9m]+)']
 );




From brukman at cs.uiuc.edu  Fri Aug 15 14:32:01 2003
From: brukman at cs.uiuc.edu (Michael Brukman)
Date: Fri Aug 15 14:32:01 2003
Subject: [llvm-commits] CVS: llvm/utils/NightlyTestTemplate.html
Message-ID: <200308151931.OAA27941@trinity.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTestTemplate.html updated: 1.9 -> 1.10

---
Log message:

* Match the column names in the report
* Describe and clarify meanings of columns
* Fix up HTML: close <a> and <li> tags


---
Diffs of the changes:

Index: llvm/utils/NightlyTestTemplate.html
diff -u llvm/utils/NightlyTestTemplate.html:1.9 llvm/utils/NightlyTestTemplate.html:1.10
--- llvm/utils/NightlyTestTemplate.html:1.9	Fri Aug 15 11:29:06 2003
+++ llvm/utils/NightlyTestTemplate.html	Fri Aug 15 14:31:04 2003
@@ -116,28 +116,33 @@
 </td></tr></table></td></tr></table></center><p>
 
 This section tests LLVM on a variety of programs in the test suite.  This
-includes benchmark suites like the Olden, ptrdist, and SPEC benchmarks as well
-as a few random programs with test inputs.  This section is meant to track how
-stable LLVM is as a whole.  The columns of the tables are:<p>
+includes benchmark suites like the Olden, McCat, Ptrdist, and SPEC benchmarks as
+well as a few random programs with test inputs.  This section is meant to track
+how stable LLVM is as a whole. A failure in the execution of any test is marked
+with an asterisk: `*'. The columns of the tables are:<p>
 
 <ol>
-<li><a name="Program">Program - The name of the program for that row
-<li><a name="GCCAS">GCCAS - Time to run LLVM optimizers on the program
-<li><a name="Bytecode">Bytecode - The size of the bytecode for the program
-<li><a name="Instrs">Instrs - The number of LLVM instructions in the
-    compiled bytecode
-<li><a name="LLC">LLC - The time taken compile with LLC (the static backend)
-<li><a name="NAT">NAT - The time taken to execute the program when compiled
-    with GCC -O3.
-<li><a name="CBE">CBE - The time taken to execute the program after compilation
-    through the C Backend.  If the diff fails, this a *.
-<li><a name="LLC">LLC - The time taken to run LLC compiled program
-<li><a name="JIT">JIT - How long does the program take to execute in the
-    Just-In-Time compiler.
-<li><a name="MachCode">MachCode - The number of bytes of machine code
-    generated by the JIT.
-<li><a name="CompTime">CompTime - The amount of time spent in the JIT itself,
-    instead of executing the program.
+<li><a name="Program">Program</a> - The name of the program for that row.</li>
+<li><a name="GCCAS">GCCAS</a> - Time to run LLVM optimizers on the program.</li>
+<li><a name="Bytecode">Bytecode</a> - The size of the bytecode for the
+    program</li>
+<li><a name="Instrs">Instrs</a> - The number of LLVM instructions in the
+    compiled bytecode</li>
+<li><a name="LLC<br>compile">LLC compile</a> - The time taken compile with
+    LLC (the static backend)</li>
+<li><a name="JIT<br>codegen">JIT codegen</a> - The amount of time spent in the
+    JIT itself, instead of executing the program.</li>
+<li><a name="Machine<br>code">Machine code</a> - The number of bytes of machine
+    code generated by the JIT.</li>
+<li><a name="GCC">GCC</a> - The time taken to execute the program when compiled
+    with GCC -O3.</li>
+<li><a name="CBE">CBE</a> - The time taken to execute the program after
+    compilation through the C Backend.</li>
+<li><a name="LLC">LLC</a> - How long does the program generated by the static
+    backend LLC take to execute </li>
+<li><a name="JIT">JIT</a> - The amount of time spent running the
+    program with the JIT; this includes the code generation phase (listed above)
+    and actually running the program.</li>
 </ol><p>
 
 A complete log of testing <a href="$DATE-ProgramTest.txt.gz">is available</a>




From lattner at cs.uiuc.edu  Fri Aug 15 15:00:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 15:00:02 2003
Subject: [llvm-commits] CVS: poolalloc/test/Makefile
Message-ID: <200308151959.OAA19687@apoc.cs.uiuc.edu>


Changes in directory poolalloc/test:

Makefile added (r1.1)

---
Log message:

Initial checkin of poolallocator test makefile


---
Diffs of the changes:

Index: poolalloc/test/Makefile
diff -c /dev/null poolalloc/test/Makefile:1.1
*** /dev/null	Fri Aug 15 14:59:44 2003
--- poolalloc/test/Makefile	Fri Aug 15 14:59:34 2003
***************
*** 0 ****
--- 1,18 ----
+ ##===- poolalloc/test/Makefile -----------------------------*- Makefile -*-===##
+ #
+ # Define the default test rule, which allows people to just type 'make test' in
+ # this directory.
+ #
+ ##===----------------------------------------------------------------------===##
+ 
+ # The default target in this directory is the test:: target
+ test::
+ 
+ LEVEL = ..
+ include $(LEVEL)/Makefile.common
+ 
+ # test target - Descend into test/Programs and run the TEST.poolalloc.Makefile
+ # tests...
+ test::
+ 	(cd $(LLVM_SRC_ROOT)/test/Programs; PROJECT_DIR=$(BUILD_OBJ_ROOT) \
+                 $(MAKE) TEST=poolalloc)




From lattner at cs.uiuc.edu  Fri Aug 15 15:01:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 15:01:01 2003
Subject: [llvm-commits] CVS: llvm/Makefile.common
Message-ID: <200308152000.PAA19704@apoc.cs.uiuc.edu>


Changes in directory llvm:

Makefile.common updated: 1.114 -> 1.115

---
Log message:

Remove extraneous ;'s, no functional changes


---
Diffs of the changes:

Index: llvm/Makefile.common
diff -u llvm/Makefile.common:1.114 llvm/Makefile.common:1.115
--- llvm/Makefile.common:1.114	Fri Aug 15 10:20:52 2003
+++ llvm/Makefile.common	Fri Aug 15 15:00:47 2003
@@ -161,13 +161,13 @@
 
 # Print out the directories used for building
 prdirs::
-	echo "Home Offset      : " $(HOME_OBJ_ROOT);
-	echo "Build Source Root: " $(BUILD_SRC_ROOT);
-	echo "Build Source Dir : " $(BUILD_SRC_DIR);
-	echo "Build Object Root: " $(BUILD_OBJ_ROOT);
-	echo "Build Object Dir : " $(BUILD_OBJ_DIR);
-	echo "LLVM  Source Root: " $(LLVM_SRC_ROOT);
-	echo "LLVM  Object Root: " $(LLVM_OBJ_ROOT);
+	echo "Home Offset      : " $(HOME_OBJ_ROOT)
+	echo "Build Source Root: " $(BUILD_SRC_ROOT)
+	echo "Build Source Dir : " $(BUILD_SRC_DIR)
+	echo "Build Object Root: " $(BUILD_OBJ_ROOT)
+	echo "Build Object Dir : " $(BUILD_OBJ_DIR)
+	echo "LLVM  Source Root: " $(LLVM_SRC_ROOT)
+	echo "LLVM  Object Root: " $(LLVM_OBJ_ROOT)
 
 #
 # Mark all of these targets as phony.  This will hopefully speed up builds
@@ -546,18 +546,18 @@
 #
 $(LIBNAME_O): $(ObjectsO) $(LibSubDirs) $(DESTLIBRELEASE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic release library =======
-	$(VERB) $(Link) -o $*.la $(ObjectsO) $(LibSubDirs) $(LibLinkOpts);
-	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
+	$(VERB) $(Link) -o $*.la $(ObjectsO) $(LibSubDirs) $(LibLinkOpts)
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
 
 $(LIBNAME_P): $(ObjectsP) $(LibSubDirs) $(DESTLIBPROFILE)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic profile library =======
-	$(VERB) $(Link) -o $*.la $(ObjectsP) $(LibSubDirs) $(LibLinkOpts);
-	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
+	$(VERB) $(Link) -o $*.la $(ObjectsP) $(LibSubDirs) $(LibLinkOpts)
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
 
 $(LIBNAME_G): $(ObjectsG) $(LibSubDirs) $(DESTLIBDEBUG)/.dir
 	@echo ======= Linking $(LIBRARYNAME) dynamic debug library =======
-	$(VERB) $(Link) -o $*.la $(ObjectsG) $(LibSubDirs) $(LibLinkOpts);
-	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT);
+	$(VERB) $(Link) -o $*.la $(ObjectsG) $(LibSubDirs) $(LibLinkOpts)
+	$(VERB) $(LIBTOOL) --mode=install $(INSTALL) $*.la $(DESTLIBCURRENT)
 
 #
 # Rules for building static archive libraries.
@@ -756,7 +756,7 @@
 # The last line is a gross hack to work around flex aparently not being able to
 # resize the buffer on a large token input.  Currently, for uninitialized string
 # buffers in LLVM we can generate very long tokens, so this is a hack around it.
-# FIXME.  (f.e. char Buffer[10000]; )
+# FIXME.  (f.e. char Buffer[10000] )
 #
 %.cpp: %.l
 	@echo Flex\'ing $<...




From brukman at cs.uiuc.edu  Fri Aug 15 15:02:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Aug 15 15:02:01 2003
Subject: [llvm-commits] CVS: llvm/include/Support/hash_map hash_set
Message-ID: <200308152001.PAA08511@zion.cs.uiuc.edu>


Changes in directory llvm/include/Support:

hash_map updated: 1.10 -> 1.11
hash_set updated: 1.10 -> 1.11

---
Log message:

hash_map and hash_set:
* Define HASH_NAMESPACE to `std' in the case of pre-3.0 GCC compilers
* Add comments to clarify the intent of all the #ifdef madness
* Add VIM directive to highlight files as C++


---
Diffs of the changes:

Index: llvm/include/Support/hash_map
diff -u llvm/include/Support/hash_map:1.10 llvm/include/Support/hash_map:1.11
--- llvm/include/Support/hash_map:1.10	Fri Jul 25 10:08:08 2003
+++ llvm/include/Support/hash_map	Fri Aug 15 15:01:10 2003
@@ -1,5 +1,6 @@
 //===-- Support/hash_map - "Portable" wrapper around hash_map ---*- C++ -*-===//
-//
+// vim:ft=cpp
+// 
 // This file provides a wrapper around the mysterious <hash_map> header file
 // that seems to move around between GCC releases into and out of namespaces at
 // will.  #including this header will cause hash_map to be available in the
@@ -21,19 +22,22 @@
 #include "Config/config.h"
 
 #ifdef HAVE_GNU_EXT_HASH_MAP
-
+// This is for GCC-3.1+ which puts hash in ext/hash_map
 #include <ext/hash_map>
 #define HASH_NAMESPACE __gnu_cxx
 
 #else
 
+// This is for GCC-3.0.x which puts hashmap in the `ext' directory.
 #ifdef HAVE_STD_EXT_HASH_MAP
 #include <ext/hash_map>
 #define HASH_NAMESPACE std
 
 #else
+// This handles older, pre-3.0 GCC which do not have the extentions in the `ext'
+// directory, and ignore the `std' namespace.
 #include <hash_map>
-#define HASH_NAMESPACE
+#define HASH_NAMESPACE std
 #endif
 
 #endif


Index: llvm/include/Support/hash_set
diff -u llvm/include/Support/hash_set:1.10 llvm/include/Support/hash_set:1.11
--- llvm/include/Support/hash_set:1.10	Fri Jul 25 10:08:08 2003
+++ llvm/include/Support/hash_set	Fri Aug 15 15:01:10 2003
@@ -1,4 +1,5 @@
 //===-- Support/hash_set - "Portable" wrapper around hash_set ---*- C++ -*-===//
+// vim:ft=cpp
 //
 // This file provides a wrapper around the mysterious <hash_set> header file
 // that seems to move around between GCC releases into and out of namespaces at
@@ -22,18 +23,22 @@
 
 #ifdef HAVE_GNU_EXT_HASH_SET
 
+// This is for GCC-3.1+ which puts hashset in ext/hash_set
 #include <ext/hash_set>
 #define HASH_NAMESPACE __gnu_cxx
 
 #else
 
+// This is for GCC-3.0.x which puts hashmap in the `ext' directory.
 #ifdef HAVE_STD_EXT_HASH_SET
 #include <ext/hash_set>
 #define HASH_NAMESPACE std
 
 #else
+// This handles older, pre-3.0 GCC which do not have the extentions in the `ext'
+// directory, and ignore the `std' namespace.
 #include <hash_set>
-#define HASH_NAMESPACE
+#define HASH_NAMESPACE std
 #endif
 
 #endif
@@ -48,4 +53,3 @@
 #include <Support/HashExtras.h>
 
 #endif
-




From gaeke at niobe.cs.uiuc.edu  Fri Aug 15 16:00:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Fri Aug 15 16:00:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/sim/.cvsignore
Message-ID: <200308152059.h7FKxvE09363@niobe.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource/sim:

.cvsignore added (r1.1)

---
Log message:

Don't remind me that sim.res exists every time I update


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/sim/.cvsignore
diff -c /dev/null llvm/test/Programs/MultiSource/sim/.cvsignore:1.1
*** /dev/null	Fri Aug 15 15:59:57 2003
--- llvm/test/Programs/MultiSource/sim/.cvsignore	Fri Aug 15 15:59:47 2003
***************
*** 0 ****
--- 1 ----
+ sim.res




From gaeke at niobe.cs.uiuc.edu  Fri Aug 15 16:07:02 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Fri Aug 15 16:07:02 2003
Subject: [llvm-commits] CVS: llvm/include/Support/CommandLine.h
Message-ID: <200308152106.h7FL65709402@niobe.cs.uiuc.edu>


Changes in directory llvm/include/Support:

CommandLine.h updated: 1.22 -> 1.23

---
Log message:

lib/Support/CommandLine.cpp:
Many changes suggested by Chris. It's okay, I'll recover from the emotional
damage...maybe someday. :-)

Collapse ParseCStringVector into ParseStringVector.  Comment it.
Make it take a const input.
Use std::string::npos instead of -1 (what a mouthful!)
Make ParseEnvironmentOptions take const inputs.
Check its args at the very beginning.
Strdup all the contents of newArgv and free them all at the end.

include/Support/CommandLine.h:
Constify progName and envVar arguments to ParseEnvironmentOptions().


---
Diffs of the changes:

Index: llvm/include/Support/CommandLine.h
diff -u llvm/include/Support/CommandLine.h:1.22 llvm/include/Support/CommandLine.h:1.23
--- llvm/include/Support/CommandLine.h:1.22	Thu Aug 14 17:04:41 2003
+++ llvm/include/Support/CommandLine.h	Fri Aug 15 16:05:55 2003
@@ -35,7 +35,7 @@
 // ParseEnvironmentOptions - Environment variable option processing alternate
 //                           entry point.
 //
-void ParseEnvironmentOptions(char *progName, char *envvar,
+void ParseEnvironmentOptions(const char *progName, const char *envvar,
                              const char *Overview = 0);
 
 //===----------------------------------------------------------------------===//




From gaeke at niobe.cs.uiuc.edu  Fri Aug 15 16:07:12 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Fri Aug 15 16:07:12 2003
Subject: [llvm-commits] CVS: llvm/lib/Support/CommandLine.cpp
Message-ID: <200308152106.h7FL67R09410@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Support:

CommandLine.cpp updated: 1.35 -> 1.36

---
Log message:

lib/Support/CommandLine.cpp:
Many changes suggested by Chris. It's okay, I'll recover from the emotional
damage...maybe someday. :-)

Collapse ParseCStringVector into ParseStringVector.  Comment it.
Make it take a const input.
Use std::string::npos instead of -1 (what a mouthful!)
Make ParseEnvironmentOptions take const inputs.
Check its args at the very beginning.
Strdup all the contents of newArgv and free them all at the end.

include/Support/CommandLine.h:
Constify progName and envVar arguments to ParseEnvironmentOptions().


---
Diffs of the changes:

Index: llvm/lib/Support/CommandLine.cpp
diff -u llvm/lib/Support/CommandLine.cpp:1.35 llvm/lib/Support/CommandLine.cpp:1.36
--- llvm/lib/Support/CommandLine.cpp:1.35	Thu Aug 14 17:00:58 2003
+++ llvm/lib/Support/CommandLine.cpp	Fri Aug 15 16:05:57 2003
@@ -152,44 +152,48 @@
          O->getNumOccurrencesFlag() == cl::OneOrMore;
 }
 
-/// ParseStringVector - Break INPUT up wherever one or more characters
-/// from DELIMS are found, and store the resulting tokens in OUTPUT.
+/// ParseCStringVector - Break INPUT up wherever one or more
+/// whitespace characters are found, and store the resulting tokens in
+/// OUTPUT. The tokens stored in OUTPUT are dynamically allocated
+/// using strdup (), so it is the caller's responsibility to free ()
+/// them later.
 ///
-static void ParseStringVector (std::vector<std::string> &output,
-			       std::string &input, const char *delims) {
+static void ParseCStringVector (std::vector<char *> &output,
+				const char *input) {
+  // Characters which will be treated as token separators:
+  static const char *delims = " \v\f\t\r\n";
+
   std::string work (input);
-  int pos = work.find_first_not_of (delims);
-  if (pos == -1) return;
+  // Skip past any delims at head of input string.
+  size_t pos = work.find_first_not_of (delims);
+  // If the string consists entirely of delims, then exit early.
+  if (pos == std::string::npos) return;
+  // Otherwise, jump forward to beginning of first word.
   work = work.substr (pos);
+  // Find position of first delimiter.
   pos = work.find_first_of (delims);
-  while (!work.empty() && pos != -1) {
-    if (pos == -1) break;
-    output.push_back (work.substr (0,pos));
-    int nextpos = work.find_first_not_of (delims, pos + 1);
-    if (nextpos != -1) {
+
+  while (!work.empty() && pos != std::string::npos) {
+    // Everything from 0 to POS is the next word to copy.
+    output.push_back (strdup (work.substr (0,pos).c_str ()));
+    // Is there another word in the string?
+    size_t nextpos = work.find_first_not_of (delims, pos + 1);
+    if (nextpos != std::string::npos) {
+      // Yes? Then remove delims from beginning ...
       work = work.substr (work.find_first_not_of (delims, pos + 1));
+      // and find the end of the word.
       pos = work.find_first_of (delims);
     } else {
+      // No? (Remainder of string is delims.) End the loop.
       work = "";
-      pos = -1;
+      pos = std::string::npos;
     }
   }
-  if (!work.empty ()) {
-    output.push_back (work);
-  }
-}
 
-/// ParseCStringVector - Same effect as ParseStringVector, but the
-/// resulting output vector contains dynamically-allocated pointers to
-/// char, instead of standard C++ strings.
-///
-static void ParseCStringVector (std::vector<char *> &output,
-				std::string &input, const char *delims) {
-  std::vector<std::string> work;
-  ParseStringVector (work, input, delims);
-  for (std::vector<std::string>::iterator i = work.begin(), e = work.end();
-       i != e; ++i) {
-    output.push_back (strdup (i->c_str ()));
+  // If `input' ended with non-delim char, then we'll get here with
+  // the last word of `input' in `work'; copy it now.
+  if (!work.empty ()) {
+    output.push_back (strdup (work.c_str ()));
   }
 }
 
@@ -198,32 +202,33 @@
 /// from the caller (as PROGNAME) and its command-line arguments from
 /// an environment variable (whose name is given in ENVVAR).
 ///
-void cl::ParseEnvironmentOptions (char *progName, char *envvar,
+void cl::ParseEnvironmentOptions (const char *progName, const char *envVar,
 				  const char *Overview) {
-  // Get program's "name", which we wouldn't know without the caller
-  // telling us.
+  // Check args.
   assert (progName && "Program name not specified");
-  static std::vector<char *> newargv; // Maybe making it "static" is a hack.
-  int newargc;
-  newargv.push_back (progName);
-
+  assert (envVar && "Environment variable name missing");
+  
   // Get the environment variable they want us to parse options out of.
-  assert (envvar && "Environment variable name missing");  
-  char *envvalue = getenv (envvar);
-  if (envvalue == NULL) {
-    // Env var not set --> act like there are no more command line
-    // arguments.
-    newargc = newargv.size ();
-    ParseCommandLineOptions (newargc, &newargv[0], Overview);
+  const char *envValue = getenv (envVar);
+  if (!envValue)
     return;
-  }
-  std::string envvaluestr (envvalue);
+
+  // Get program's "name", which we wouldn't know without the caller
+  // telling us.
+  std::vector<char *> newArgv;
+  newArgv.push_back (strdup (progName));
 
   // Parse the value of the environment variable into a "command line"
   // and hand it off to ParseCommandLineOptions().
-  ParseCStringVector (newargv, envvaluestr, " \v\f\t\r\n");
-  newargc = newargv.size ();
-  ParseCommandLineOptions (newargc, &newargv[0], Overview);
+  ParseCStringVector (newArgv, envValue);
+  int newArgc = newArgv.size ();
+  ParseCommandLineOptions (newArgc, &newArgv[0], Overview);
+
+  // Free all the strdup()ed strings.
+  for (std::vector<char *>::iterator i = newArgv.begin (), e = newArgv.end ();
+       i != e; ++i) {
+    free (*i);
+  }
 }
 
 void cl::ParseCommandLineOptions(int &argc, char **argv,




From gaeke at niobe.cs.uiuc.edu  Fri Aug 15 16:20:02 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Fri Aug 15 16:20:02 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLocal.cpp
Message-ID: <200308152119.h7FLJZf09539@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

RegAllocLocal.cpp updated: 1.24 -> 1.25

---
Log message:

Fix typo in comment


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.24 llvm/lib/CodeGen/RegAllocLocal.cpp:1.25
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.24	Wed Aug 13 13:18:12 2003
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Fri Aug 15 16:19:25 2003
@@ -475,7 +475,7 @@
       for (unsigned i = 0; ImplicitUses[i]; ++i)
         MarkPhysRegRecentlyUsed(ImplicitUses[i]);
 
-    // Get the used operands into registers.  This has the potiential to spill
+    // Get the used operands into registers.  This has the potential to spill
     // incoming values if we are out of registers.  Note that we completely
     // ignore physical register uses here.  We assume that if an explicit
     // physical register is referenced by the instruction, that it is guaranteed




From lattner at cs.uiuc.edu  Fri Aug 15 16:33:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 16:33:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile
Message-ID: <200308152132.QAA03739@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

Makefile updated: 1.17 -> 1.18

---
Log message:

Add support to allow projects to define their own reports


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile
diff -u llvm/test/Programs/Makefile:1.17 llvm/test/Programs/Makefile:1.18
--- llvm/test/Programs/Makefile:1.17	Wed Jul  2 09:48:55 2003
+++ llvm/test/Programs/Makefile	Fri Aug 15 16:32:32 2003
@@ -15,8 +15,10 @@
 # test.<testname>.%  given input from Output/%.llvm.bc
 #
 ifdef TEST
-TestMakefile := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).Makefile)
-TestReport   := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).report)
+TestMakefile := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).Makefile) \
+                $(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).Makefile)
+TestReport   := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).report) \
+                $(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).report)
 ifneq ($(TestMakefile),)
 -include $(TestMakefile)
 endif
@@ -29,21 +31,24 @@
 report.$(TEST).raw.out: $(REPORT_DEPENDENCIES) $(TestMakefile)
 	gmake TEST=$(TEST) 2>&1 | tee $@
 
-
+ifneq ($(TestReport),)
 report.$(TEST).txt: report.$(TEST).raw.out $(TestReport)
-	./GenerateReport.pl TEST.$(TEST).report < $< > $@
+	./GenerateReport.pl $(TestReport) < $< > $@
 
 report.$(TEST).html: report.$(TEST).raw.out $(TestReport)
-	./GenerateReport.pl -html TEST.$(TEST).report < $< > $@
+	./GenerateReport.pl -html $(TestReport) < $< > $@
 
 report.$(TEST).tex: report.$(TEST).raw.out $(TestReport)
-	./GenerateReport.pl -latex TEST.$(TEST).report < $< > $@
+	./GenerateReport.pl -latex $(TestReport) < $< > $@
 
 report: report.$(TEST).txt
 	@cat $<
 
+report.html: report.$(TEST).html
+
 report.tex: report.$(TEST).tex
 	@cat $<
+endif
 
 clean::
 	rm -f report.*.raw.out report.*.txt




From lattner at cs.uiuc.edu  Fri Aug 15 16:34:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 16:34:01 2003
Subject: [llvm-commits] CVS: poolalloc/test/TEST.poolalloc.Makefile TEST.poolalloc.report Makefile
Message-ID: <200308152133.QAA03756@apoc.cs.uiuc.edu>


Changes in directory poolalloc/test:

TEST.poolalloc.Makefile added (r1.1)
TEST.poolalloc.report added (r1.1)
Makefile updated: 1.1 -> 1.2

---
Log message:

Initial checkin of the pool allocator test and report descriptions


---
Diffs of the changes:

Index: poolalloc/test/TEST.poolalloc.Makefile
diff -c /dev/null poolalloc/test/TEST.poolalloc.Makefile:1.1
*** /dev/null	Fri Aug 15 16:33:13 2003
--- poolalloc/test/TEST.poolalloc.Makefile	Fri Aug 15 16:33:03 2003
***************
*** 0 ****
--- 1,75 ----
+ ##===- poolalloc/test/TEST.poolalloc.Makefile --------------*- Makefile -*-===##
+ #
+ # This test runs the pool allocator on all of the Programs, producing some
+ # performance numbers and statistics.
+ #
+ ##===----------------------------------------------------------------------===##
+ 
+ CURDIR  := $(shell cd .; pwd)
+ PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)/
+ RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
+ 
+ # Pool allocator shared object and runtime library...
+ PA_SO  := $(PROJECT_DIR)/lib/Debug/libpoolalloc.so
+ PA_RT  := $(PROJECT_DIR)/lib/Bytecode/libpoolalloc.bc
+ 
+ # Command to run opt with the pool allocator pass loaded
+ OPT_PA := $(LOPT) -load $(PA_SO)
+ 
+ # OPT_PA_STATS - Run opt with the -stats and -time-passes options, capturing the
+ # output to a file.
+ OPT_PA_STATS = $(OPT_PA) -info-output-file=$(CURDIR)/$@.info -stats -time-passes
+ 
+ # This rule runs the pool allocator on the .llvm.bc file to produce a new .bc
+ # file
+ $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).transformed.bc): \
+ Output/%.$(TEST).transformed.bc: Output/%.llvm.bc $(PA_SO)
+ 	-$(OPT_PA_STATS) -q -poolalloc $< -o $@ -f 2>&1 > $@.out
+ 
+ # This rule compiles the new .bc file into a .s file using LLC
+ $(PROGRAMS_TO_TEST:%=Output/%.poolalloc.llc.s): \
+ Output/%.poolalloc.llc.s: Output/%.llvm.bc $(LLC)
+ 	-$(LLC) $(LLCFLAGS) -f $< -o $@
+ 
+ # This rule compiles the .s file into an executable using $CC
+ $(PROGRAMS_TO_TEST:%=Output/%.poolalloc.llc): \
+ Output/%.poolalloc.llc: Output/%.poolalloc.llc.s
+ 	-$(CC) $(CFLAGS) $< $(LLCLIBS) $(LDFLAGS) -o $@
+ 
+ # This rule runs the generated executable, generating timing information
+ $(PROGRAMS_TO_TEST:%=Output/%.poolalloc.out-llc): \
+ Output/%.poolalloc.out-llc: Output/%.poolalloc.llc
+ 	-$(RUNSAFELY) $(STDIN_FILENAME) $@ $< $(RUN_OPTIONS)
+ 
+ # This rule diffs the post-poolallocated version to make sure we didn't break
+ # the program!
+ $(PROGRAMS_TO_TEST:%=Output/%.poolalloc.diff-llc): \
+ Output/%.poolalloc.diff-llc: Output/%.out-nat Output/%.poolalloc.out-llc
+ 	@cp Output/$*.out-nat Output/$*.poolalloc.out-nat
+ 	-$(DIFFPROG) llc $*.poolalloc $(HIDEDIFF)
+ 
+ 
+ 
+ # This rule wraps everything together to build the actual output the report is
+ # generated from.
+ $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
+ Output/%.$(TEST).report.txt: Output/%.$(TEST).transformed.bc Output/%.exe-llc \
+ 			     Output/%.poolalloc.diff-llc
+ 	@echo > $@
+ 	@-if test -f Output/$*.poolalloc.diff-llc; then \
+ 	  printf "LLC-RUN-TIME-NORMAL: " >> $@;\
+ 	  grep "^real" Output/$*.out-llc.time >> $@;\
+ 	  printf "LLC-RUN-TIME-POOLALLOC: " >> $@;\
+ 	  grep "^real" Output/$*.poolalloc.out-llc.time >> $@;\
+ 	fi
+ 
+ 	@#cat Output/$*.$(TEST).transformed.bc.info >> $@
+ 	@#cat Output/$*.$(TEST).transformed.bc.out  >> $@
+ 
+ 
+ $(PROGRAMS_TO_TEST:%=test.$(TEST).%): \
+ test.$(TEST).%: Output/%.$(TEST).report.txt
+ 	@echo "---------------------------------------------------------------"
+ 	@echo ">>> ========= '$(RELDIR)/$*' Program"
+ 	@echo "---------------------------------------------------------------"
+ 	@cat $<


Index: poolalloc/test/TEST.poolalloc.report
diff -c /dev/null poolalloc/test/TEST.poolalloc.report:1.1
*** /dev/null	Fri Aug 15 16:33:13 2003
--- poolalloc/test/TEST.poolalloc.report	Fri Aug 15 16:33:03 2003
***************
*** 0 ****
--- 1,32 ----
+ ##=== TEST.poolalloc.report - Report description for poolalloc -*- perl -*-===##
+ #
+ # This file defines a report to be generated for the pool allocator tests.
+ #
+ ##===----------------------------------------------------------------------===##
+ 
+ # Sort by program name
+ $SortCol = 0;
+ 
+ sub Ratio {
+   my ($Cols, $Col) = @_;
+   if ($Cols->[$Col-1] ne "*" and $Cols->[$Col-2] ne "*" and
+       $Cols->[$Col-1] != "0") {
+     return 100.0*$Cols->[$Col-2]/$Cols->[$Col-1] . "%";
+   } else {
+     return "n/a";
+   }
+ }
+ 
+ # These are the columns for the report.  The first entry is the header for the
+ # column, the second is the regex to use to match the value.  Empty list create
+ # seperators, and closures may be put in for custom processing.
+ (
+ # Name
+  ["Name:" , '\'([^\']+)\' Program'],
+  [],
+ # Times
+  ["Normal<br>ExeTime"  , 'LLC-RUN-TIME-NORMAL: real[\t ]+0m([0-9.]+)'],
+  ["PoolAlloc<br>ExeTime", 'LLC-RUN-TIME-POOLALLOC: real[\t ]+0m([0-9.]+)'],
+  ["% Speedup", \&Ratio],         # Normal / PA
+  []
+ );


Index: poolalloc/test/Makefile
diff -u poolalloc/test/Makefile:1.1 poolalloc/test/Makefile:1.2
--- poolalloc/test/Makefile:1.1	Fri Aug 15 14:59:34 2003
+++ poolalloc/test/Makefile	Fri Aug 15 16:33:03 2003
@@ -14,5 +14,6 @@
 # test target - Descend into test/Programs and run the TEST.poolalloc.Makefile
 # tests...
 test::
-	(cd $(LLVM_SRC_ROOT)/test/Programs; PROJECT_DIR=$(BUILD_OBJ_ROOT) \
-                $(MAKE) TEST=poolalloc)
+	(cd $(LLVM_SRC_ROOT)/test/Programs/$(SUBDIR); \
+               PROJECT_DIR=$(BUILD_OBJ_ROOT) $(MAKE) TEST=poolalloc \
+                   report report.html )




From lattner at cs.uiuc.edu  Fri Aug 15 17:38:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 17:38:02 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Jello/2003-08-15-AllocaAssertion.ll
Message-ID: <200308152237.RAA11654@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Jello:

2003-08-15-AllocaAssertion.ll added (r1.1)

---
Log message:

New testcase identified by misha, distilled from the 'ls' program


---
Diffs of the changes:

Index: llvm/test/Regression/Jello/2003-08-15-AllocaAssertion.ll
diff -c /dev/null llvm/test/Regression/Jello/2003-08-15-AllocaAssertion.ll:1.1
*** /dev/null	Fri Aug 15 17:37:05 2003
--- llvm/test/Regression/Jello/2003-08-15-AllocaAssertion.ll	Fri Aug 15 17:36:55 2003
***************
*** 0 ****
--- 1,9 ----
+ ; This testcase failed to work because two variable sized allocas confused the
+ ; local register allocator.
+ 
+ int %main(uint %X) {
+   %A = alloca uint, uint %X
+ 
+   %B = alloca float, uint %X
+   ret int 0
+ }




From lattner at cs.uiuc.edu  Fri Aug 15 18:16:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Aug 15 18:16:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll
Message-ID: <200308152315.SAA12600@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/LoopPreheaders:

2003-08-15-PreheadersFail.ll added (r1.1)

---
Log message:

new testcase narrowed down from xboard


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll
diff -c /dev/null llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll:1.1
*** /dev/null	Fri Aug 15 18:15:48 2003
--- llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll	Fri Aug 15 18:15:37 2003
***************
*** 0 ****
--- 1,65 ----
+ ; RUN: as < %s | opt -tailduplicate -instcombine -simplifycfg -print -licm -disable-output
+ 
+ target endian = little
+ target pointersize = 32
+ %yy_base = external global [787 x short]		; <[787 x short]*> [#uses=1]
+ %yy_state_ptr = external global int*		; <int**> [#uses=3]
+ %yy_state_buf = external global [16386 x int]		; <[16386 x int]*> [#uses=1]
+ %yy_lp = external global int		; <int*> [#uses=1]
+ 
+ implementation   ; Functions:
+ 
+ int %_yylex() {		; No predecessors!
+ 	br label %loopentry.0
+ 
+ loopentry.0:		; preds = %0, %else.26
+ 	store int* getelementptr ([16386 x int]* %yy_state_buf, long 0, long 0), int** %yy_state_ptr
+ 	%tmp.35 = load int** %yy_state_ptr		; <int*> [#uses=2]
+ 	%inc.0 = getelementptr int* %tmp.35, long 1		; <int*> [#uses=1]
+ 	store int* %inc.0, int** %yy_state_ptr
+ 	%tmp.36 = load int* null		; <int> [#uses=1]
+ 	store int %tmp.36, int* %tmp.35
+ 	br label %loopexit.2
+ 
+ loopexit.2:		; preds = %loopentry.0, %else.26, %loopexit.2
+ 	store sbyte* null, sbyte** null
+ 	%tmp.91 = load int* null		; <int> [#uses=1]
+ 	%tmp.92 = cast int %tmp.91 to long		; <long> [#uses=1]
+ 	%tmp.93 = getelementptr [787 x short]* %yy_base, long 0, long %tmp.92		; <short*> [#uses=1]
+ 	%tmp.94 = load short* %tmp.93		; <short> [#uses=1]
+ 	%tmp.95 = setne short %tmp.94, 4394		; <bool> [#uses=1]
+ 	br bool %tmp.95, label %loopexit.2, label %yy_find_action
+ 
+ yy_find_action:		; preds = %loopexit.2, %else.26
+ 	br label %loopentry.3
+ 
+ loopentry.3:		; preds = %yy_find_action, %shortcirc_done.0, %then.9
+ 	%tmp.105 = load int* %yy_lp		; <int> [#uses=1]
+ 	%tmp.106 = setne int %tmp.105, 0		; <bool> [#uses=1]
+ 	br bool %tmp.106, label %shortcirc_next.0, label %shortcirc_done.0
+ 
+ shortcirc_next.0:		; preds = %loopentry.3
+ 	%tmp.114 = load short* null		; <short> [#uses=1]
+ 	%tmp.115 = cast short %tmp.114 to int		; <int> [#uses=1]
+ 	%tmp.116 = setlt int 0, %tmp.115		; <bool> [#uses=1]
+ 	br label %shortcirc_done.0
+ 
+ shortcirc_done.0:		; preds = %loopentry.3, %shortcirc_next.0
+ 	%shortcirc_val.0 = phi bool [ false, %loopentry.3 ], [ %tmp.116, %shortcirc_next.0 ]		; <bool> [#uses=1]
+ 	br bool %shortcirc_val.0, label %else.0, label %loopentry.3
+ 
+ else.0:		; preds = %shortcirc_done.0
+ 	%tmp.144 = load int* null		; <int> [#uses=1]
+ 	%tmp.145 = and int %tmp.144, 8192		; <int> [#uses=1]
+ 	%tmp.146 = setne int %tmp.145, 0		; <bool> [#uses=1]
+ 	br bool %tmp.146, label %then.9, label %else.26
+ 
+ then.9:		; preds = %else.0
+ 	br label %loopentry.3
+ 
+ else.26:		; preds = %else.1
+ 	switch uint 0, label %loopentry.0 [
+ 		 uint 2, label %yy_find_action
+ 		 uint 0, label %loopexit.2
+ 	]
+ }




From brukman at cs.uiuc.edu  Fri Aug 15 18:32:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Aug 15 18:32:01 2003
Subject: [llvm-commits] CVS: llvm/tools/llee/README.txt ExecveHandler.c SysUtils.c SysUtils.h
Message-ID: <200308152331.SAA19063@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llee:

README.txt added (r1.1)
ExecveHandler.c updated: 1.1 -> 1.2
SysUtils.c updated: 1.1 -> 1.2
SysUtils.h updated: 1.1 -> 1.2

---
Log message:

A lot of changes were suggested by Chris.

ExecveHandler.c:
* Use "" instead of <> for LLVM include files
* Use raw I/O, we don't need buffering
* Set errno = 0 before using open()
* strlen() doesn't count NULL terminator in its size
* Use memcmp() instead of strcmp()
* Return result of the real execve(), not 0
* Search for path to bytecode file if not absolute/relative path

SysUtils.c:
* Convert all comments to C-style
* Stop using `bool', use `unsigned' instead

SysUtils.h:
* Stop using `bool', use `unsigned' instead
* Updated comment to FindExecutable()

README.txt:
* Describe the goal of LLEE and an application


---
Diffs of the changes:

Index: llvm/tools/llee/README.txt
diff -c /dev/null llvm/tools/llee/README.txt:1.1
*** /dev/null	Fri Aug 15 18:31:27 2003
--- llvm/tools/llee/README.txt	Fri Aug 15 18:31:16 2003
***************
*** 0 ****
--- 1,12 ----
+               LLEE: (LL)VM (E)xecution (E)nvironment
+ 
+ This tool presents a virtual execution environment for LLVM programs. By
+ preloading a shared object which defines a custom execve() functions, we can
+ execute bytecode files with the JIT directly, without the user ever thinking
+ about it.
+ 
+ Thus, a user can freely run any program, native or LLVM bytecode, transparently,
+ and without even being aware of it.
+ 
+ To use LLEE, run `./llee <native_program>', a good choice is a shell. Anything
+ started within that program will be affected by the execve() replacement.


Index: llvm/tools/llee/ExecveHandler.c
diff -u llvm/tools/llee/ExecveHandler.c:1.1 llvm/tools/llee/ExecveHandler.c:1.2
--- llvm/tools/llee/ExecveHandler.c:1.1	Mon Aug 11 17:29:36 2003
+++ llvm/tools/llee/ExecveHandler.c	Fri Aug 15 18:31:16 2003
@@ -6,9 +6,11 @@
 //===----------------------------------------------------------------------===//
 
 #include "SysUtils.h"
-#include <Config/dlfcn.h>
-#include <Config/errno.h>
-#include <Config/stdlib.h>
+#include "Config/dlfcn.h"
+#include "Config/errno.h"
+#include "Config/stdlib.h"
+#include "Config/unistd.h"
+#include <fcntl.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -52,18 +54,17 @@
 int execve(const char *filename, char *const argv[], char *const envp[])
 {
   /* Open the file, test to see if first four characters are "llvm" */
-  char header[4];
-  FILE *file = fopen(filename, "r");
+  size_t headerSize = strlen(llvmHeader);
+  char header[headerSize];
+  errno = 0;
+  int file = open(filename, O_RDONLY);
   /* Check validity of `file' */
-  if (errno) { return errno; }
+  if (errno) return EIO;
   /* Read the header from the file */
-  size_t headerSize = strlen(llvmHeader) - 1; // ignore the NULL terminator
-  size_t bytesRead = fread(header, sizeof(char), headerSize, file);
-  fclose(file);
-  if (bytesRead != headerSize) { 
-    return EIO;
-  }
-  if (!strncmp(llvmHeader, header, headerSize)) {
+  ssize_t bytesRead = read(file, header, headerSize);
+  close(file);
+  if (bytesRead != headerSize) return EIO;
+  if (!memcmp(llvmHeader, header, headerSize)) {
     /* 
      * This is a bytecode file, so execute the JIT with the program and
      * parameters.
@@ -72,21 +73,30 @@
     for (argvSize = 0, idx = 0; argv[idx] && argv[idx][0]; ++idx)
       ++argvSize;
     char **LLIargs = (char**) malloc(sizeof(char*) * (argvSize+2));
+    char *BCpath;
+    /* 
+     * If the program is specified with a relative or absolute path, 
+     * then just use the path and filename as is, otherwise search for it.
+     */
+    if (filename[0] != '.' && filename[0] != '/')
+      BCpath = FindExecutable(filename);
+    else
+      BCpath = (char*) filename;
+    if (!BCpath) {
+      fprintf(stderr, "Cannot find path to `%s', exiting.\n", filename);
+      return -1;
+    }
     char *LLIpath = FindExecutable("lli");
     if (!LLIpath) {
       fprintf(stderr, "Cannot find path to `lli', exiting.\n");
       return -1;
     }
     LLIargs[0] = LLIpath;
-    for (idx = 0; idx != argvSize; ++idx)
+    LLIargs[1] = BCpath;
+    for (idx = 1; idx != argvSize; ++idx)
       LLIargs[idx+1] = argv[idx];
     LLIargs[argvSize + 1] = '\0';
-    /*
-    for (idx = 0; idx != argvSize+2; ++idx)
-      printf("LLI args[%d] = \"%s\"\n", idx, LLIargs[idx]);
-    */
     return executeProgram(LLIpath, LLIargs, envp);
   }
-  executeProgram(filename, argv, envp); 
-  return 0;
+  return executeProgram(filename, argv, envp); 
 }


Index: llvm/tools/llee/SysUtils.c
diff -u llvm/tools/llee/SysUtils.c:1.1 llvm/tools/llee/SysUtils.c:1.2
--- llvm/tools/llee/SysUtils.c:1.1	Mon Aug 11 17:29:36 2003
+++ llvm/tools/llee/SysUtils.c	Fri Aug 15 18:31:16 2003
@@ -15,16 +15,17 @@
 #include <stdlib.h>
 #include <string.h>
 
-/// isExecutableFile - This function returns true if the filename specified
-/// exists and is executable.
-///
-bool isExecutableFile(const char *ExeFileName) {
+/*
+ * isExecutableFile - This function returns true if the filename specified
+ * exists and is executable.
+ */
+unsigned isExecutableFile(const char *ExeFileName) {
   struct stat Buf;
   if (stat(ExeFileName, &Buf))
-    return false;  // Must not be executable!
+    return 0;                        // Must not be executable!
 
   if (!(Buf.st_mode & S_IFREG))
-    return false;                    // Not a regular file?
+    return 0;                        // Not a regular file?
 
   if (Buf.st_uid == getuid())        // Owner of file?
     return Buf.st_mode & S_IXUSR;
@@ -34,15 +35,16 @@
     return Buf.st_mode & S_IXOTH;
 }
 
-/// FindExecutable - Find a named executable in the directories listed in $PATH.
-/// If the executable cannot be found, returns NULL.
-/// 
+/*
+ * FindExecutable - Find a named executable in the directories listed in $PATH.
+ * If the executable cannot be found, returns NULL.
+ */ 
 char *FindExecutable(const char *ExeName) {
   /* Try to find the executable in the path */
   const char *PathStr = getenv("PATH");
   if (PathStr == 0) return "";
 
-  // Now we have a colon separated list of directories to search... try them...
+  /* Now we have a colon separated list of directories to search, try them. */
   unsigned PathLen = strlen(PathStr);
   while (PathLen) {
     /* Find the next colon */
@@ -76,6 +78,6 @@
     ++Colon;
   }
 
-  // If we fell out, we ran out of directories in PATH to search, return failure
+  /* If we fell out, we ran out of directories to search, return failure. */
   return NULL;
 }


Index: llvm/tools/llee/SysUtils.h
diff -u llvm/tools/llee/SysUtils.h:1.1 llvm/tools/llee/SysUtils.h:1.2
--- llvm/tools/llee/SysUtils.h:1.1	Mon Aug 11 17:29:36 2003
+++ llvm/tools/llee/SysUtils.h	Fri Aug 15 18:31:16 2003
@@ -1,4 +1,4 @@
-/*===- sysutils.h - Utilities to do low-level system stuff -------*- C -*--===*\
+/*===- SysUtils.h - Utilities to do low-level system stuff -------*- C -*--===*\
  *                                                                            *
  * This file contains functions used to do a variety of low-level, often      *
  * system-specific, tasks.                                                    *
@@ -8,20 +8,14 @@
 #ifndef SYSUTILS_H
 #define SYSUTILS_H
 
-typedef unsigned bool;
-enum { false = 0, true = 1 };
-
 /*
  * isExecutableFile - This function returns true if the filename specified
  * exists and is executable.
  */
-bool isExecutableFile(const char *ExeFileName);
+unsigned isExecutableFile(const char *ExeFileName);
 
 /*
- * FindExecutable - Find a named executable, giving the argv[0] of program
- * being executed. This allows us to find another LLVM tool if it is built into
- * the same directory, but that directory is neither the current directory, nor
- * in the PATH.  If the executable cannot be found, return an empty string.
+ * FindExecutable - Find a named executable in the path.
  */ 
 char *FindExecutable(const char *ExeName);
 




From brukman at cs.uiuc.edu  Fri Aug 15 18:33:01 2003
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Fri Aug 15 18:33:01 2003
Subject: [llvm-commits] CVS: llvm/tools/llee/Makefile
Message-ID: <200308152332.SAA19089@zion.cs.uiuc.edu>


Changes in directory llvm/tools/llee:

Makefile updated: 1.1 -> 1.2

---
Log message:

`execve_test' is not part of LLEE.


---
Diffs of the changes:

Index: llvm/tools/llee/Makefile
diff -u llvm/tools/llee/Makefile:1.1 llvm/tools/llee/Makefile:1.2
--- llvm/tools/llee/Makefile:1.1	Mon Aug 11 17:29:36 2003
+++ llvm/tools/llee/Makefile	Fri Aug 15 18:31:54 2003
@@ -6,7 +6,7 @@
 OBJS = $(SRCS:%.c=%.o)
 SO   = execve.so
 
-all: $(SO) execve_test
+all: $(SO)
 	
 %.o: %.c
 	gcc -g -I../../include -D_GNU_SOURCE $< -c -o $@




From gaeke at niobe.cs.uiuc.edu  Fri Aug 15 19:15:00 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Fri Aug 15 19:15:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Trace.h
Message-ID: <200308160014.h7G0EHM10091@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Reoptimizer/LightWtProfiling/Trigger:

Trace.h added (r1.1)

---
Log message:

Data structure to contain traces. This is very much a work in progress,
so constructive criticisms are welcome...


---
Diffs of the changes:

Index: llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Trace.h
diff -c /dev/null llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Trace.h:1.1
*** /dev/null	Fri Aug 15 19:14:17 2003
--- llvm/lib/Reoptimizer/LightWtProfiling/Trigger/Trace.h	Fri Aug 15 19:14:07 2003
***************
*** 0 ****
--- 1,95 ----
+ //===- Trace.h - Wrapper class for traces ------------------------*- C++ -*--=//
+ //
+ // Encapsulates vectors of BasicBlocks as traces.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #include "llvm/Function.h"
+ #include <iostream>
+ class Module;
+ 
+ #ifndef TRACE_H
+ #define TRACE_H
+ 
+ class Trace {
+   /// Function in which this Trace starts.
+   ///
+   Function *F;
+ 
+ public:
+   typedef std::vector<BasicBlock *> BasicBlockListType;
+   BasicBlockListType BasicBlocks;
+ 
+   /// getEntryBasicBlock - Return the entry basic block (first block)
+   /// of the trace.
+   ///
+   inline BasicBlock *getEntryBasicBlock () { return BasicBlocks[0]; }
+ 
+   /// contains - Returns true if this trace contains the given basic
+   /// block.
+   ///
+   inline bool contains (const BasicBlock *X) {
+     return std::find(BasicBlocks.begin(), BasicBlocks.end(), X)
+       != BasicBlocks.end();
+   }
+ 
+   /// Trace ctor - make new Trace from vector of basic blocks, residing
+   /// in given function.
+   ///
+   Trace(Function *F_, std::vector<BasicBlock *> vBB) :
+     F(F_), BasicBlocks(vBB) {
+   }
+ 
+   /// Trace ctor - make new Trace from vector of basic blocks, residing
+   /// in function which is the parent of the first BB in the vector.
+   ///
+   Trace(std::vector<BasicBlock *> vBB) :
+     F(vBB[0]->getParent ()), BasicBlocks(vBB) {
+   }
+ 
+   /// Return this Trace's parent Function.
+   ///
+   inline Function *getFunction () { return F; }
+ 
+   /// Return this Module that contains this trace's parent Function.
+   ///
+   inline Module *getModule () { return F->getParent(); }
+ 
+   inline int getFunctionIndex (BasicBlock *b) { return 0; } // FIXME
+ 
+   /// Write trace to file as s-expression
+   ///
+   void print (std::ostream &O) {
+ 	O << "(trace\n";
+ 	O << "\t(function-name " << F->getName () << ")\n";
+ 	O << "\t(function \"" << *F << "\")\n";
+     O << "\t(blocks \n";
+     for (iterator i = begin (), e = end(); i != e; ++i) {
+       unsigned index = getFunctionIndex (*i);
+       O << "\t\t(block " << index << " \"" << (*i)->getName () << "\")\n";
+     }
+     O << "\t)\n";
+     O << ")\n";
+   }
+ 
+   // BasicBlock iterators...
+   typedef BasicBlockListType::iterator iterator;
+   typedef BasicBlockListType::const_iterator const_iterator;
+   typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
+   typedef std::reverse_iterator<iterator> reverse_iterator;
+ 
+   iterator                begin()       { return BasicBlocks.begin(); }
+   const_iterator          begin() const { return BasicBlocks.begin(); }
+   iterator                end  ()       { return BasicBlocks.end();   }
+   const_iterator          end  () const { return BasicBlocks.end();   }
+ 
+   reverse_iterator       rbegin()       { return BasicBlocks.rbegin(); }
+   const_reverse_iterator rbegin() const { return BasicBlocks.rbegin(); }
+   reverse_iterator       rend  ()       { return BasicBlocks.rend();   }
+   const_reverse_iterator rend  () const { return BasicBlocks.rend();   }
+ 
+   unsigned                 size() const { return BasicBlocks.size(); }
+   bool                    empty() const { return BasicBlocks.empty(); }
+ };
+ 
+ #endif // TRACE_H




From gaeke at niobe.cs.uiuc.edu  Fri Aug 15 19:24:01 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Fri Aug 15 19:24:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/Sparc/Sparc.cpp
Message-ID: <200308160023.h7G0NMH10199@niobe.cs.uiuc.edu>


Changes in directory llvm/lib/Target/Sparc:

Sparc.cpp updated: 1.76 -> 1.77

---
Log message:

Rename -emitmaps to -enable-maps


---
Diffs of the changes:

Index: llvm/lib/Target/Sparc/Sparc.cpp
diff -u llvm/lib/Target/Sparc/Sparc.cpp:1.76 llvm/lib/Target/Sparc/Sparc.cpp:1.77
--- llvm/lib/Target/Sparc/Sparc.cpp:1.76	Thu Aug 14 01:04:59 2003
+++ llvm/lib/Target/Sparc/Sparc.cpp	Fri Aug 15 19:23:12 2003
@@ -46,7 +46,7 @@
 static cl::opt<bool> DisablePeephole("disable-peephole",
                                 cl::desc("Disable peephole optimization pass"));
 
-static cl::opt<bool> EmitMappingInfo("emitmaps",
+static cl::opt<bool> EmitMappingInfo("enable-maps",
              cl::desc("Emit LLVM-to-MachineCode mapping info to assembly"));
 
 static cl::opt<bool> DisableStrip("disable-strip",




From gaeke at niobe.cs.uiuc.edu  Fri Aug 15 19:24:10 2003
From: gaeke at niobe.cs.uiuc.edu (Brian Gaeke)
Date: Fri Aug 15 19:24:10 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.reopt.Makefile
Message-ID: <200308160023.h7G0NQh10207@niobe.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.reopt.Makefile updated: 1.1 -> 1.2

---
Log message:

Rename -emitmaps to -enable-maps


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.reopt.Makefile
diff -u llvm/test/Programs/TEST.reopt.Makefile:1.1 llvm/test/Programs/TEST.reopt.Makefile:1.2
--- llvm/test/Programs/TEST.reopt.Makefile:1.1	Fri Aug 15 13:51:28 2003
+++ llvm/test/Programs/TEST.reopt.Makefile	Fri Aug 15 19:23:16 2003
@@ -50,7 +50,7 @@
 Output/%.reopt-llc.s: Output/%.llvm.bc
 	@echo "========================================="
 	@echo "Compiling Reoptimizer version of '$(TESTNAME)'"
-	-$(LOPT) -q -inline -lowerswitch -branch-combine -emitfuncs -instloops $< | $(LLC) $(LLCFLAGS) -disable-sched -f -emitmaps -o $@
+	-$(LOPT) -q -inline -lowerswitch -branch-combine -emitfuncs -instloops $< | $(LLC) $(LLCFLAGS) -disable-sched -f -enable-maps -o $@
 
 # 2. Link the instrumented binary with the necessary parts of the
 # compiler.




From lattner at cs.uiuc.edu  Sat Aug 16 15:57:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Aug 16 15:57:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll
Message-ID: <200308162056.PAA19252@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/LoopPreheaders:

2003-08-15-PreheadersFail.ll updated: 1.1 -> 1.2

---
Log message:

No need to print in the testcase



---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll
diff -u llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll:1.1 llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll:1.2
--- llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll:1.1	Fri Aug 15 18:15:37 2003
+++ llvm/test/Regression/Transforms/LoopPreheaders/2003-08-15-PreheadersFail.ll	Sat Aug 16 15:56:35 2003
@@ -1,4 +1,4 @@
-; RUN: as < %s | opt -tailduplicate -instcombine -simplifycfg -print -licm -disable-output
+; RUN: as < %s | opt -tailduplicate -instcombine -simplifycfg -licm -disable-output
 
 target endian = little
 target pointersize = 32




From lattner at cs.uiuc.edu  Sat Aug 16 15:58:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Aug 16 15:58:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/LoopInfo.cpp
Message-ID: <200308162057.PAA19275@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis:

LoopInfo.cpp updated: 1.37 -> 1.38

---
Log message:

Fix bug: LoopPreheaders/2003-08-15-PreheadersFail.ll



---
Diffs of the changes:

Index: llvm/lib/Analysis/LoopInfo.cpp
diff -u llvm/lib/Analysis/LoopInfo.cpp:1.37 llvm/lib/Analysis/LoopInfo.cpp:1.38
--- llvm/lib/Analysis/LoopInfo.cpp:1.37	Thu May 15 13:03:51 2003
+++ llvm/lib/Analysis/LoopInfo.cpp	Sat Aug 16 15:57:16 2003
@@ -47,8 +47,8 @@
   return NumBackEdges;
 }
 
-void Loop::print(std::ostream &OS) const {
-  OS << std::string(getLoopDepth()*2, ' ') << "Loop Containing: ";
+void Loop::print(std::ostream &OS, unsigned Depth) const {
+  OS << std::string(Depth*2, ' ') << "Loop Containing: ";
 
   for (unsigned i = 0; i < getBlocks().size(); ++i) {
     if (i) OS << ",";
@@ -65,7 +65,7 @@
   OS << "\n";
 
   for (unsigned i = 0, e = getSubLoops().size(); i != e; ++i)
-    getSubLoops()[i]->print(OS);
+    getSubLoops()[i]->print(OS, Depth+2);
 }
 
 void Loop::dump() const {
@@ -186,7 +186,6 @@
       NewLoop->ParentLoop = L;
     }
 
-
   // Add the basic blocks that comprise this loop to the BBMap so that this
   // loop can be found for them.
   //
@@ -197,6 +196,46 @@
       BBMap.insert(BBMI, std::make_pair(*I, L));   // Must be at this level
   }
 
+  // Now that we have a list of all of the child loops of this loop, check to
+  // see if any of them should actually be nested inside of each other.  We can
+  // accidentally pull loops our of their parents, so we must make sure to
+  // organize the loop nests correctly now.
+  {
+    std::map<BasicBlock*, Loop*> ContainingLoops;
+    for (unsigned i = 0; i != L->SubLoops.size(); ++i) {
+      Loop *Child = L->SubLoops[i];
+      assert(Child->getParentLoop() == L && "Not proper child loop?");
+
+      if (Loop *ContainingLoop = ContainingLoops[Child->getHeader()]) {
+        // If there is already a loop which contains this loop, move this loop
+        // into the containing loop.
+        MoveSiblingLoopInto(Child, ContainingLoop);
+        --i;  // The loop got removed from the SubLoops list.
+      } else {
+        // This is currently considered to be a top-level loop.  Check to see if
+        // any of the contained blocks are loop headers for subloops we have
+        // already processed.
+        for (unsigned b = 0, e = Child->Blocks.size(); b != e; ++b) {
+          Loop *&BlockLoop = ContainingLoops[Child->Blocks[b]];
+          if (BlockLoop == 0) {   // Child block not processed yet...
+            BlockLoop = Child;
+          } else if (BlockLoop != Child) {
+            // There is already a loop which contains this block, that means
+            // that we should reparent the loop which the block is currently
+            // considered to belong to to be a child of this loop.
+            MoveSiblingLoopInto(BlockLoop, Child);
+            
+            // Reparent all of the blocks which used to belong to BlockLoops
+            for (unsigned j = 0, e = BlockLoop->Blocks.size(); j != e; ++j)
+              ContainingLoops[BlockLoop->Blocks[j]] = Child;
+            
+            --i;  // We just shrunk the SubLoops list.
+          }
+        }
+      }      
+    }
+  }
+
   // Now that we know all of the blocks that make up this loop, see if there are
   // any branches to outside of the loop... building the ExitBlocks list.
   for (std::vector<BasicBlock*>::iterator BI = L->Blocks.begin(),
@@ -207,6 +246,44 @@
 
   return L;
 }
+
+/// MoveSiblingLoopInto - This method moves the NewChild loop to live inside of
+/// the NewParent Loop, instead of being a sibling of it.
+void LoopInfo::MoveSiblingLoopInto(Loop *NewChild, Loop *NewParent) {
+  Loop *OldParent = NewChild->getParentLoop();
+  assert(OldParent && OldParent == NewParent->getParentLoop() &&
+         NewChild != NewParent && "Not sibling loops!");
+
+  // Remove NewChild from being a child of OldParent
+  std::vector<Loop*>::iterator I =
+    std::find(OldParent->SubLoops.begin(), OldParent->SubLoops.end(), NewChild);
+  assert(I != OldParent->SubLoops.end() && "Parent fields incorrect??");
+  OldParent->SubLoops.erase(I);   // Remove from parent's subloops list
+  NewChild->ParentLoop = 0;
+  
+  InsertLoopInto(NewChild, NewParent);  
+}
+
+/// InsertLoopInto - This inserts loop L into the specified parent loop.  If the
+/// parent loop contains a loop which should contain L, the loop gets inserted
+/// into L instead.
+void LoopInfo::InsertLoopInto(Loop *L, Loop *Parent) {
+  BasicBlock *LHeader = L->getHeader();
+  assert(Parent->contains(LHeader) && "This loop should not be inserted here!");
+  
+  // Check to see if it belongs in a child loop...
+  for (unsigned i = 0, e = Parent->SubLoops.size(); i != e; ++i)
+    if (Parent->SubLoops[i]->contains(LHeader)) {
+      InsertLoopInto(L, Parent->SubLoops[i]);
+      return;
+    }      
+
+  // If not, insert it here!
+  Parent->SubLoops.push_back(L);
+  L->ParentLoop = Parent;
+}
+
+
 
 /// getLoopPreheader - If there is a preheader for this loop, return it.  A
 /// loop has a preheader if there is only one edge to the header of the loop




From lattner at cs.uiuc.edu  Sat Aug 16 15:58:10 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat Aug 16 15:58:10 2003
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/LoopInfo.h
Message-ID: <200308162057.PAA19268@apoc.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Analysis:

LoopInfo.h updated: 1.25 -> 1.26

---
Log message:

Fix bug: LoopPreheaders/2003-08-15-PreheadersFail.ll


---
Diffs of the changes:

Index: llvm/include/llvm/Analysis/LoopInfo.h
diff -u llvm/include/llvm/Analysis/LoopInfo.h:1.25 llvm/include/llvm/Analysis/LoopInfo.h:1.26
--- llvm/include/llvm/Analysis/LoopInfo.h:1.25	Fri Feb 28 10:54:37 2003
+++ llvm/include/llvm/Analysis/LoopInfo.h	Sat Aug 16 15:57:13 2003
@@ -32,17 +32,17 @@
 class Loop {
   Loop *ParentLoop;
   std::vector<Loop*> SubLoops;       // Loops contained entirely within this one
-  std::vector<BasicBlock *> Blocks;  // First entry is the header node
-  std::vector<BasicBlock *> ExitBlocks; // Reachable blocks outside the loop
+  std::vector<BasicBlock*> Blocks;   // First entry is the header node
+  std::vector<BasicBlock*> ExitBlocks; // Reachable blocks outside the loop
   unsigned LoopDepth;                // Nesting depth of this loop
 
   Loop(const Loop &);                  // DO NOT IMPLEMENT
   const Loop &operator=(const Loop &); // DO NOT IMPLEMENT
 public:
 
-  inline unsigned getLoopDepth() const { return LoopDepth; }
-  inline BasicBlock *getHeader() const { return Blocks.front(); }
-  inline Loop *getParentLoop() const { return ParentLoop; }
+  unsigned getLoopDepth() const { return LoopDepth; }
+  BasicBlock *getHeader() const { return Blocks.front(); }
+  Loop *getParentLoop() const { return ParentLoop; }
 
   /// contains - Return true of the specified basic block is in this loop
   bool contains(const BasicBlock *BB) const;
@@ -105,7 +105,7 @@
   ///
   void changeExitBlock(BasicBlock *Old, BasicBlock *New);
 
-  void print(std::ostream &O) const;
+  void print(std::ostream &O, unsigned Depth = 0) const;
   void dump() const;
 private:
   friend class LoopInfo;
@@ -181,6 +181,8 @@
 private:
   void Calculate(const DominatorSet &DS);
   Loop *ConsiderForLoop(BasicBlock *BB, const DominatorSet &DS);
+  void MoveSiblingLoopInto(Loop *NewChild, Loop *NewParent);
+  void InsertLoopInto(Loop *L, Loop *Parent);
 };
 
 




From lattner at cs.uiuc.edu  Sun Aug 17 13:02:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 13:02:01 2003
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLocal.cpp
Message-ID: <200308171801.NAA02886@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

RegAllocLocal.cpp updated: 1.25 -> 1.26

---
Log message:

Fix bug: Jello/2003-08-15-AllocaAssertion.ll


---
Diffs of the changes:

Index: llvm/lib/CodeGen/RegAllocLocal.cpp
diff -u llvm/lib/CodeGen/RegAllocLocal.cpp:1.25 llvm/lib/CodeGen/RegAllocLocal.cpp:1.26
--- llvm/lib/CodeGen/RegAllocLocal.cpp:1.25	Fri Aug 15 16:19:25 2003
+++ llvm/lib/CodeGen/RegAllocLocal.cpp	Sun Aug 17 13:01:15 2003
@@ -143,10 +143,12 @@
                       unsigned VirtReg, unsigned PhysReg);
 
     /// spillPhysReg - This method spills the specified physical register into
-    /// the virtual register slot associated with it.
+    /// the virtual register slot associated with it.  If OnlyVirtRegs is set to
+    /// true, then the request is ignored if the physical register does not
+    /// contain a virtual register.
     ///
     void spillPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I,
-                      unsigned PhysReg);
+                      unsigned PhysReg, bool OnlyVirtRegs = false);
 
     /// assignVirtToPhysReg - This method updates local state so that we know
     /// that PhysReg is the proper container for VirtReg now.  The physical
@@ -259,20 +261,24 @@
 
 
 /// spillPhysReg - This method spills the specified physical register into the
-/// virtual register slot associated with it.
+/// virtual register slot associated with it.  If OnlyVirtRegs is set to true,
+/// then the request is ignored if the physical register does not contain a
+/// virtual register.
 ///
 void RA::spillPhysReg(MachineBasicBlock &MBB, MachineBasicBlock::iterator &I,
-                      unsigned PhysReg) {
+                      unsigned PhysReg, bool OnlyVirtRegs) {
   std::map<unsigned, unsigned>::iterator PI = PhysRegsUsed.find(PhysReg);
   if (PI != PhysRegsUsed.end()) {             // Only spill it if it's used!
-    spillVirtReg(MBB, I, PI->second, PhysReg);
+    if (PI->second || !OnlyVirtRegs)
+      spillVirtReg(MBB, I, PI->second, PhysReg);
   } else if (const unsigned *AliasSet = RegInfo->getAliasSet(PhysReg)) {
     // If the selected register aliases any other registers, we must make
     // sure that one of the aliases isn't alive...
     for (unsigned i = 0; AliasSet[i]; ++i) {
       PI = PhysRegsUsed.find(AliasSet[i]);
       if (PI != PhysRegsUsed.end())     // Spill aliased register...
-	spillVirtReg(MBB, I, PI->second, AliasSet[i]);
+        if (PI->second || !OnlyVirtRegs)
+          spillVirtReg(MBB, I, PI->second, AliasSet[i]);
     }
   }
 }
@@ -520,7 +526,7 @@
            MI->getOperand(i).opIsDefAndUse()) &&
           MI->getOperand(i).isPhysicalRegister()) {
         unsigned Reg = MI->getOperand(i).getAllocatedRegNum();
-        spillPhysReg(MBB, I, Reg);        // Spill any existing value in the reg
+        spillPhysReg(MBB, I, Reg, true);  // Spill any existing value in the reg
         PhysRegsUsed[Reg] = 0;            // It is free and reserved now
         PhysRegsUseOrder.push_back(Reg);
       }
@@ -618,7 +624,11 @@
               << I->second << "\n";
 
   assert(Virt2PhysRegMap.empty() && "Virtual registers still in phys regs?");
-  assert(PhysRegsUseOrder.empty() && "Physical regs still allocated?");
+  
+  // Clear any physical register which appear live at the end of the basic
+  // block, but which do not hold any virtual registers.  e.g., the stack
+  // pointer.
+  PhysRegsUseOrder.clear();
 }
 
 




From lattner at cs.uiuc.edu  Sun Aug 17 13:38:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 13:38:01 2003
Subject: [llvm-commits] CVS: llvm/runtime/libtrace/Makefile
Message-ID: <200308171837.NAA03053@apoc.cs.uiuc.edu>


Changes in directory llvm/runtime/libtrace:

Makefile updated: 1.6 -> 1.7

---
Log message:

This really isn't the gcc library!


---
Diffs of the changes:

Index: llvm/runtime/libtrace/Makefile
diff -u llvm/runtime/libtrace/Makefile:1.6 llvm/runtime/libtrace/Makefile:1.7
--- llvm/runtime/libtrace/Makefile:1.6	Thu Aug 14 21:38:06 2003
+++ llvm/runtime/libtrace/Makefile	Sun Aug 17 13:37:45 2003
@@ -1,7 +1,7 @@
 LEVEL = ../..
 BYTECODE_LIBRARY=1
 #DONT_BUILD_RELINKED=1
-LIBRARYNAME=gcc
+LIBRARYNAME=trace
 
 include $(LEVEL)/Makefile.common
 




From lattner at cs.uiuc.edu  Sun Aug 17 14:30:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 14:30:02 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
Message-ID: <200308171929.OAA03576@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/SimplifyCFG:

2003-08-17-BranchFold.ll added (r1.1)

---
Log message:

New testcase


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll
diff -c /dev/null llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll:1.1
*** /dev/null	Sun Aug 17 14:29:44 2003
--- llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFold.ll	Sun Aug 17 14:29:34 2003
***************
*** 0 ****
--- 1,20 ----
+ ; This test checks to make sure that 'br X, Dest, Dest' is folded into 
+ ; 'br Dest'
+ 
+ ; RUN: as < %s | opt -simplifycfg | dis | not grep 'br bool %c2'
+ 
+ declare void %noop()
+ 
+ int %test(bool %c1, bool %c2) {
+ 	call void %noop()
+ 	br bool %c1, label %A, label %Y
+ A:
+ 	call void %noop()
+  	br bool %c2, label %X, label %X   ; Can be converted to unconditional br
+ X:
+ 	call void %noop()
+ 	ret int 0
+ Y:
+ 	call void %noop()
+ 	br label %X
+ }




From lattner at cs.uiuc.edu  Sun Aug 17 14:36:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 14:36:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/Local.cpp
Message-ID: <200308171935.OAA04145@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

Local.cpp updated: 1.6 -> 1.7

---
Log message:

The fixme is irrelevant: if that happens, the LLVM bytecode is malformed.
This fixes testcase: SimplifyCFG/2003-08-17-BranchFold.ll


---
Diffs of the changes:

Index: llvm/lib/Transforms/Utils/Local.cpp
diff -u llvm/lib/Transforms/Utils/Local.cpp:1.6 llvm/lib/Transforms/Utils/Local.cpp:1.7
--- llvm/lib/Transforms/Utils/Local.cpp:1.6	Tue May 20 16:01:18 2003
+++ llvm/lib/Transforms/Utils/Local.cpp	Sun Aug 17 14:34:55 2003
@@ -61,12 +61,7 @@
       // unconditional branch.
       BI->setUnconditionalDest(Destination);
       return true;
-    }
-#if 0
-    // FIXME: TODO: This doesn't work if the destination has PHI nodes with
-    // different incoming values on each branch!
-    //
-    else if (Dest2 == Dest1) {       // Conditional branch to same location?
+    } else if (Dest2 == Dest1) {       // Conditional branch to same location?
       // This branch matches something like this:  
       //     br bool %cond, label %Dest, label %Dest
       // and changes it into:  br label %Dest
@@ -79,7 +74,6 @@
       BI->setUnconditionalDest(Dest1);
       return true;
     }
-#endif
   }
   return false;
 }




From lattner at cs.uiuc.edu  Sun Aug 17 14:39:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 14:39:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
Message-ID: <200308171938.OAA04231@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/SimplifyCFG:

2003-08-17-BranchFoldOrdering.ll added (r1.1)

---
Log message:

New testcase


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll
diff -c /dev/null llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll:1.1
*** /dev/null	Sun Aug 17 14:38:07 2003
--- llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-BranchFoldOrdering.ll	Sun Aug 17 14:37:57 2003
***************
*** 0 ****
--- 1,24 ----
+ ; This test checks to make sure that 'br X, Dest, Dest' is folded into 
+ ; 'br Dest'.  This can only happen after the 'Z' block is eliminated.  This is
+ ; due to the fact that the SimplifyCFG function does not use 
+ ; the ConstantFoldTerminator function.
+ 
+ ; RUN: as < %s | opt -simplifycfg | dis | not grep 'br bool %c2'
+ 
+ declare void %noop()
+ 
+ int %test(bool %c1, bool %c2) {
+ 	call void %noop()
+ 	br bool %c1, label %A, label %Y
+ A:
+ 	call void %noop()
+  	br bool %c2, label %Z, label %X   ; Can be converted to unconditional br
+ Z:
+ 	br label %X
+ X:
+ 	call void %noop()
+ 	ret int 0
+ Y:
+ 	call void %noop()
+ 	br label %X
+ }




From lattner at cs.uiuc.edu  Sun Aug 17 14:43:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 14:43:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/Local.cpp SimplifyCFG.cpp
Message-ID: <200308171942.OAA04780@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

Local.cpp updated: 1.7 -> 1.8
SimplifyCFG.cpp updated: 1.12 -> 1.13

---
Log message:

Fix bug: SimplifyCFG/2003-08-17-BranchFoldOrdering.ll



---
Diffs of the changes:

Index: llvm/lib/Transforms/Utils/Local.cpp
diff -u llvm/lib/Transforms/Utils/Local.cpp:1.7 llvm/lib/Transforms/Utils/Local.cpp:1.8
--- llvm/lib/Transforms/Utils/Local.cpp:1.7	Sun Aug 17 14:34:55 2003
+++ llvm/lib/Transforms/Utils/Local.cpp	Sun Aug 17 14:41:53 2003
@@ -74,6 +74,12 @@
       BI->setUnconditionalDest(Dest1);
       return true;
     }
+  } else if (SwitchInst *SI = dyn_cast<SwitchInst>(TI)) {
+    if (ConstantInt *CI = dyn_cast<ConstantInt>(SI->getCondition())) {
+
+
+    }
+
   }
   return false;
 }


Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.12 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.13
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.12	Tue Aug  5 11:27:44 2003
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sun Aug 17 14:41:53 2003
@@ -121,6 +121,10 @@
     return true;
   }
 
+  // Check to see if we can constant propagate this terminator instruction
+  // away...
+  bool Changed = ConstantFoldTerminator(BB);
+
   // Check to see if this block has no non-phi instructions and only a single
   // successor.  If so, replace references to this basic block with references
   // to the successor.
@@ -251,5 +255,5 @@
     }
   }
   
-  return false;
+  return Changed;
 }




From lattner at cs.uiuc.edu  Sun Aug 17 15:20:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 15:20:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
Message-ID: <200308172019.PAA06287@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/Transforms/SimplifyCFG:

2003-08-17-FoldSwitch.ll added (r1.1)

---
Log message:

New testcase to ensure that switch folding happens correctly


---
Diffs of the changes:

Index: llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll
diff -c /dev/null llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll:1.1
*** /dev/null	Sun Aug 17 15:19:41 2003
--- llvm/test/Regression/Transforms/SimplifyCFG/2003-08-17-FoldSwitch.ll	Sun Aug 17 15:19:31 2003
***************
*** 0 ****
--- 1,49 ----
+ ; RUN: as < %s | opt -simplifycfg | dis | not grep switch
+ 
+ int %test1() {   ; Test normal folding
+ 	switch uint 5, label %Default [
+ 		uint 0, label %Foo
+ 		uint 1, label %Bar
+ 		uint 2, label %Baz
+ 		uint 5, label %TheDest
+ 	]
+ Default:ret int -1
+ Foo:	ret int -2
+ Bar:	ret int -3
+ Baz: 	ret int -4
+ TheDest:ret int 1234
+ }
+ 
+ int %test2() {   ; Test folding to default dest
+ 	switch uint 3, label %Default [
+ 		uint 0, label %Foo
+ 		uint 1, label %Bar
+ 		uint 2, label %Baz
+ 		uint 5, label %TheDest
+ 	]
+ Default:ret int 1234
+ Foo:	ret int -2
+ Bar:	ret int -5
+ Baz: 	ret int -6
+ TheDest:ret int -8
+ }
+ 
+ int %test3(bool %C) {   ; Test folding all to same dest
+ 	br bool %C, label %Start, label %TheDest
+ Start:
+ 	switch uint 3, label %TheDest [
+ 		uint 0, label %TheDest
+ 		uint 1, label %TheDest
+ 		uint 2, label %TheDest
+ 		uint 5, label %TheDest
+ 	]
+ TheDest: ret int 1234
+ }
+ 
+ int %test4(uint %C) {   ; Test folding switch -> branch
+ 	switch uint %C, label %L1 [
+ 		uint 0, label %L2
+ 	]
+ L1:	ret int 0
+ L2:	ret int 1
+ }




From lattner at cs.uiuc.edu  Sun Aug 17 15:22:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 15:22:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/Local.cpp
Message-ID: <200308172021.PAA06462@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

Local.cpp updated: 1.8 -> 1.9

---
Log message:

Implement folding of switch instructions. 
Implements SimplifyCFG/2003-08-17-FoldSwitch.ll


---
Diffs of the changes:

Index: llvm/lib/Transforms/Utils/Local.cpp
diff -u llvm/lib/Transforms/Utils/Local.cpp:1.8 llvm/lib/Transforms/Utils/Local.cpp:1.9
--- llvm/lib/Transforms/Utils/Local.cpp:1.8	Sun Aug 17 14:41:53 2003
+++ llvm/lib/Transforms/Utils/Local.cpp	Sun Aug 17 15:21:14 2003
@@ -7,6 +7,7 @@
 
 #include "llvm/Transforms/Utils/Local.h"
 #include "llvm/iTerminators.h"
+#include "llvm/iOperators.h"
 #include "llvm/ConstantHandling.h"
 
 //===----------------------------------------------------------------------===//
@@ -74,12 +75,64 @@
       BI->setUnconditionalDest(Dest1);
       return true;
     }
-  } else if (SwitchInst *SI = dyn_cast<SwitchInst>(TI)) {
-    if (ConstantInt *CI = dyn_cast<ConstantInt>(SI->getCondition())) {
-
+  } else if (SwitchInst *SI = dyn_cast<SwitchInst>(T)) {
+    // If we are switching on a constant, we can convert the switch into a
+    // single branch instruction!
+    ConstantInt *CI = dyn_cast<ConstantInt>(SI->getCondition());
+    BasicBlock *TheOnlyDest = SI->getSuccessor(0);  // The default dest
+
+    // Figure out which case it goes to...
+    for (unsigned i = 1, e = SI->getNumSuccessors(); i != e; ++i) {
+      // Found case matching a constant operand?
+      if (SI->getSuccessorValue(i) == CI) {
+        TheOnlyDest = SI->getSuccessor(i);
+        break;
+      }
+
+      // Otherwise, check to see if the switch only branches to one destination.
+      // We do this by reseting "TheOnlyDest" to null when we find two non-equal
+      // destinations.
+      if (SI->getSuccessor(i) != TheOnlyDest) TheOnlyDest = 0;
+    }
 
+    if (CI && !TheOnlyDest) {
+      // Branching on a constant, but not any of the cases, go to the default
+      // successor.
+      TheOnlyDest = SI->getDefaultDest();
     }
 
+    // If we found a single destination that we can fold the switch into, do so
+    // now.
+    if (TheOnlyDest) {
+      // Insert the new branch..
+      new BranchInst(TheOnlyDest, SI);
+      BasicBlock *BB = SI->getParent();
+
+      // Remove entries from PHI nodes which we no longer branch to...
+      for (unsigned i = 0, e = SI->getNumSuccessors(); i != e; ++i) {
+        // Found case matching a constant operand?
+        BasicBlock *Succ = SI->getSuccessor(i);
+        if (Succ == TheOnlyDest)
+          TheOnlyDest = 0;  // Don't modify the first branch to TheOnlyDest
+        else
+          Succ->removePredecessor(BB);
+      }
+
+      // Delete the old switch...
+      BB->getInstList().erase(SI);
+      return true;
+    } else if (SI->getNumSuccessors() == 2) {
+      // Otherwise, we can fold this switch into a conditional branch
+      // instruction if it has only one non-default destination.
+      Value *Cond = new SetCondInst(Instruction::SetEQ, SI->getCondition(),
+                                    SI->getSuccessorValue(1), "cond", SI);
+      // Insert the new branch...
+      new BranchInst(SI->getSuccessor(1), SI->getSuccessor(0), Cond, SI);
+
+      // Delete the old switch...
+      SI->getParent()->getInstList().erase(SI);
+      return true;
+    }
   }
   return false;
 }




From lattner at cs.uiuc.edu  Sun Aug 17 15:53:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 15:53:01 2003
Subject: [llvm-commits] CVS: llvm/utils/NightlyTest.pl
Message-ID: <200308172052.PAA12902@apoc.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTest.pl updated: 1.19 -> 1.20

---
Log message:

Make the check for a failed test run more robust!!


---
Diffs of the changes:

Index: llvm/utils/NightlyTest.pl
diff -u llvm/utils/NightlyTest.pl:1.19 llvm/utils/NightlyTest.pl:1.20
--- llvm/utils/NightlyTest.pl:1.19	Thu Aug 14 10:26:28 2003
+++ llvm/utils/NightlyTest.pl	Sun Aug 17 15:52:05 2003
@@ -170,7 +170,7 @@
 my $BuildWallTime = GetRegex "([0-9.]+)", `grep '^real' $Prefix-Build-Log.txt`;
 my $BuildTime  = $BuildTimeU+$BuildTimeS;  # BuildTime = User+System
 my $BuildError = "";
-if (`grep '^gmake: .*Error' $Prefix-Build-Log.txt | wc -l` + 0) {
+if (`grep '^gmake[^:]*: .*Error' $Prefix-Build-Log.txt | wc -l` + 0) {
   $BuildError = "<h3>Build error: compilation <a href=\"$DATE-Build-Log.txt\">"
               . "aborted</a></h3>";
 }




From lattner at cs.uiuc.edu  Sun Aug 17 16:48:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 16:48:00 2003
Subject: [llvm-commits] CVS: llvm/lib/Analysis/LoopInfo.cpp
Message-ID: <200308172147.QAA19651@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis:

LoopInfo.cpp updated: 1.38 -> 1.39

---
Log message:

Fix the bug that broke the nightly tester in McCat/18-imp last night.  :(


---
Diffs of the changes:

Index: llvm/lib/Analysis/LoopInfo.cpp
diff -u llvm/lib/Analysis/LoopInfo.cpp:1.38 llvm/lib/Analysis/LoopInfo.cpp:1.39
--- llvm/lib/Analysis/LoopInfo.cpp:1.38	Sat Aug 16 15:57:16 2003
+++ llvm/lib/Analysis/LoopInfo.cpp	Sun Aug 17 16:47:33 2003
@@ -220,15 +220,15 @@
           if (BlockLoop == 0) {   // Child block not processed yet...
             BlockLoop = Child;
           } else if (BlockLoop != Child) {
+            Loop *SubLoop = BlockLoop;
+            // Reparent all of the blocks which used to belong to BlockLoops
+            for (unsigned j = 0, e = SubLoop->Blocks.size(); j != e; ++j)
+              ContainingLoops[SubLoop->Blocks[j]] = Child;
+
             // There is already a loop which contains this block, that means
             // that we should reparent the loop which the block is currently
             // considered to belong to to be a child of this loop.
-            MoveSiblingLoopInto(BlockLoop, Child);
-            
-            // Reparent all of the blocks which used to belong to BlockLoops
-            for (unsigned j = 0, e = BlockLoop->Blocks.size(); j != e; ++j)
-              ContainingLoops[BlockLoop->Blocks[j]] = Child;
-            
+            MoveSiblingLoopInto(SubLoop, Child);
             --i;  // We just shrunk the SubLoops list.
           }
         }




From lattner at cs.uiuc.edu  Sun Aug 17 17:09:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 17:09:00 2003
Subject: [llvm-commits] CVS: llvm/tools/bugpoint/CodeGeneratorBug.cpp
Message-ID: <200308172208.RAA21737@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/bugpoint:

CodeGeneratorBug.cpp updated: 1.14 -> 1.15

---
Log message:

Fix message


---
Diffs of the changes:

Index: llvm/tools/bugpoint/CodeGeneratorBug.cpp
diff -u llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.14 llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.15
--- llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.14	Thu Aug  7 16:42:28 2003
+++ llvm/tools/bugpoint/CodeGeneratorBug.cpp	Sun Aug 17 17:08:25 2003
@@ -253,8 +253,9 @@
     for (unsigned i=0, e = InputArgv.size(); i != e; ++i)
       std::cout << " " << InputArgv[i];
     std::cout << "\n";
-    std::cout << "The shared object was created with:\ndis -c " << SafeModuleBC 
-              << "-o " << SharedObject << "\n";
+    std::cout << "The shared object was created with:\n  dis -c "
+              << SafeModuleBC << " -o temporary.c\n"
+              << "  gcc -shared temporary.c -o " << SharedObject << "\n";
   } else {
     removeFile(TestModuleBC);
     removeFile(SafeModuleBC);




From lattner at cs.uiuc.edu  Sun Aug 17 17:15:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 17:15:01 2003
Subject: [llvm-commits] CVS: llvm/tools/bugpoint/CodeGeneratorBug.cpp
Message-ID: <200308172214.RAA22009@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/bugpoint:

CodeGeneratorBug.cpp updated: 1.15 -> 1.16

---
Log message:

Make sure that "newmain" gets names for its arguments


---
Diffs of the changes:

Index: llvm/tools/bugpoint/CodeGeneratorBug.cpp
diff -u llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.15 llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.16
--- llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.15	Sun Aug 17 17:08:25 2003
+++ llvm/tools/bugpoint/CodeGeneratorBug.cpp	Sun Aug 17 17:14:20 2003
@@ -357,8 +357,11 @@
     // Call the old main function and return its result
     BasicBlock *BB = new BasicBlock("entry", newMain);
     std::vector<Value*> args;
-    for (Function::aiterator I=newMain->abegin(), E=newMain->aend(); I!=E; ++I)
+    for (Function::aiterator I = newMain->abegin(), E = newMain->aend(),
+           OI = oldMain->abegin(); I != E; ++I, ++OI) {
+      I->setName(OI->getName());    // Copy argument names from oldMain
       args.push_back(I);
+    }
     CallInst *call = new CallInst(oldMain, args);
     BB->getInstList().push_back(call);
     




From lattner at cs.uiuc.edu  Sun Aug 17 18:21:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 18:21:01 2003
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/X86TargetMachine.cpp
Message-ID: <200308172320.SAA22962@apoc.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

X86TargetMachine.cpp updated: 1.23 -> 1.24

---
Log message:

Fix ABI issue: Longs really do need to be only 4 byte aligned on X86.

This bug caused miscompilation of programs using 'struct stat', but only if 
compiled with support for 64-bit filesystems.  This could in theory effect 
other things, but only if the LLVM code shared data structures with native code.


---
Diffs of the changes:

Index: llvm/lib/Target/X86/X86TargetMachine.cpp
diff -u llvm/lib/Target/X86/X86TargetMachine.cpp:1.23 llvm/lib/Target/X86/X86TargetMachine.cpp:1.24
--- llvm/lib/Target/X86/X86TargetMachine.cpp:1.23	Wed Aug 13 13:15:52 2003
+++ llvm/lib/Target/X86/X86TargetMachine.cpp	Sun Aug 17 18:20:40 2003
@@ -39,7 +39,8 @@
 		  (Config & TM::EndianMask) == TM::LittleEndian,
 		  (Config & TM::PtrSizeMask) == TM::PtrSize64 ? 8 : 4,
 		  (Config & TM::PtrSizeMask) == TM::PtrSize64 ? 8 : 4,
-		  (Config & TM::PtrSizeMask) == TM::PtrSize64 ? 8 : 4),
+		  (Config & TM::PtrSizeMask) == TM::PtrSize64 ? 8 : 4,
+                  4, (Config & TM::PtrSizeMask) == TM::PtrSize64 ? 8 : 4),
   FrameInfo(TargetFrameInfo::StackGrowsDown, 8/*16 for SSE*/, 4) {
 }
 




From lattner at cs.uiuc.edu  Sun Aug 17 18:40:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 18:40:01 2003
Subject: [llvm-commits] CVS: llvm/tools/bugpoint/CodeGeneratorBug.cpp
Message-ID: <200308172339.SAA23367@apoc.cs.uiuc.edu>


Changes in directory llvm/tools/bugpoint:

CodeGeneratorBug.cpp updated: 1.16 -> 1.17

---
Log message:

Give correct command line for making a shared object


---
Diffs of the changes:

Index: llvm/tools/bugpoint/CodeGeneratorBug.cpp
diff -u llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.16 llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.17
--- llvm/tools/bugpoint/CodeGeneratorBug.cpp:1.16	Sun Aug 17 17:14:20 2003
+++ llvm/tools/bugpoint/CodeGeneratorBug.cpp	Sun Aug 17 18:38:53 2003
@@ -255,7 +255,13 @@
     std::cout << "\n";
     std::cout << "The shared object was created with:\n  dis -c "
               << SafeModuleBC << " -o temporary.c\n"
-              << "  gcc -shared temporary.c -o " << SharedObject << "\n";
+              << "  gcc -xc temporary.c -O2 -o " << SharedObject
+#if defined(sparc) || defined(__sparc__) || defined(__sparcv9)
+              << "-G"            // Compile a shared library, `-G' for Sparc
+#else                             
+              << "-shared"      // `-shared' for Linux/X86, maybe others
+#endif
+              << "\n";
   } else {
     removeFile(TestModuleBC);
     removeFile(SafeModuleBC);




From lattner at cs.uiuc.edu  Sun Aug 17 21:58:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 21:58:01 2003
Subject: [llvm-commits] CVS: llvm/test/Regression/CFrontend/2003-08-17-DeadCodeShortCircuit.c.tr
Message-ID: <200308180257.VAA25094@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Regression/CFrontend:

2003-08-17-DeadCodeShortCircuit.c.tr added (r1.1)

---
Log message:

New testcase distilled from GNU Go 


---
Diffs of the changes:

Index: llvm/test/Regression/CFrontend/2003-08-17-DeadCodeShortCircuit.c.tr
diff -c /dev/null llvm/test/Regression/CFrontend/2003-08-17-DeadCodeShortCircuit.c.tr:1.1
*** /dev/null	Sun Aug 17 21:57:42 2003
--- llvm/test/Regression/CFrontend/2003-08-17-DeadCodeShortCircuit.c.tr	Sun Aug 17 21:57:31 2003
***************
*** 0 ****
--- 1,7 ----
+ // RUN: llvmgcc -xc %s -c
+ 
+ int test(_Bool pos, _Bool color) {
+   return 0;
+   return (pos && color);
+ }
+ 




From lattner at cs.uiuc.edu  Sun Aug 17 22:46:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 22:46:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile
Message-ID: <200308180345.WAA07865@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

Makefile updated: 1.18 -> 1.19

---
Log message:

Update dependencies


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile
diff -u llvm/test/Programs/Makefile:1.18 llvm/test/Programs/Makefile:1.19
--- llvm/test/Programs/Makefile:1.18	Fri Aug 15 16:32:32 2003
+++ llvm/test/Programs/Makefile	Sun Aug 17 22:45:37 2003
@@ -32,13 +32,13 @@
 	gmake TEST=$(TEST) 2>&1 | tee $@
 
 ifneq ($(TestReport),)
-report.$(TEST).txt: report.$(TEST).raw.out $(TestReport)
+report.$(TEST).txt: report.$(TEST).raw.out $(TestReport) ./GenerateReport.pl
 	./GenerateReport.pl $(TestReport) < $< > $@
 
-report.$(TEST).html: report.$(TEST).raw.out $(TestReport)
+report.$(TEST).html: report.$(TEST).raw.out $(TestReport) ./GenerateReport.pl
 	./GenerateReport.pl -html $(TestReport) < $< > $@
 
-report.$(TEST).tex: report.$(TEST).raw.out $(TestReport)
+report.$(TEST).tex: report.$(TEST).raw.out $(TestReport) ./GenerateReport.pl
 	./GenerateReport.pl -latex $(TestReport) < $< > $@
 
 report: report.$(TEST).txt




From lattner at cs.uiuc.edu  Sun Aug 17 23:09:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:09:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.Makefile
Message-ID: <200308180408.XAA25719@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.24 -> 1.25

---
Log message:

Do not remove .info files, allowing tests to be rerun successfully
Eliminate fuzzy match in the $(INFO_PREFIX) variable, use correct match instead


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.24 llvm/test/Programs/TEST.nightly.Makefile:1.25
--- llvm/test/Programs/TEST.nightly.Makefile:1.24	Fri Aug 15 11:26:16 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Sun Aug 17 23:08:47 2003
@@ -16,8 +16,6 @@
 TIMEOPT = -time-passes -stats -info-output-file=$(CURDIR)/$@.info
 EXTRA_LLI_OPTS = $(TIMEOPT)
 
-INFO_PREFIX = Output/$*.*-
-
 # Compilation tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.compile.report.txt): \
 Output/%.nightly.compile.report.txt: Output/%.llvm.bc $(LGCCAS)
@@ -39,7 +37,6 @@
 	else \
 	  echo "TEST-FAIL: compile $(RELDIR)/$*" >> $@;\
 	fi
-	-rm -f $@.info
 
 # NAT tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.nat.report.txt): \
@@ -59,12 +56,11 @@
 	  printf "TEST-RESULT-llc: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  printf "TEST-RESULT-llc-time: " >> $@;\
-	  grep "^real" $(INFO_PREFIX)llc.time >> $@;\
+	  grep "^real" Output/$*.out-llc.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: llc $(RELDIR)/$*" >> $@;\
 	fi
-	-rm -f $@.info
 
 # CBE tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.cbe.report.txt): \
@@ -74,7 +70,7 @@
 	@-if test -f Output/$*.exe-cbe; then \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-cbe-time: " >> $@;\
-	  grep "^real" $(INFO_PREFIX)cbe.time >> $@;\
+	  grep "^real" Output/$*.out-cbe.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: cbe $(RELDIR)/$*" >> $@;\
@@ -88,18 +84,17 @@
 	@-if test -f Output/$*.exe-jit; then \
 	  echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-jit-time: " >> $@;\
-	  grep "^real" $(INFO_PREFIX)jit.time >> $@;\
+	  grep "^real" Output/$*.out-jit.time >> $@;\
 	  echo >> $@;\
 	  printf "TEST-RESULT-jit-comptime: " >> $@;\
-	  grep "Total Execution Time" $(INFO_PREFIX)jit.info >> $@;\
+	  grep "Total Execution Time" Output/$*.out-jit.info >> $@;\
 	  echo >> $@;\
 	  printf "TEST-RESULT-jit-machcode: " >> $@;\
-	  grep "bytes of machine code compiled" $(INFO_PREFIX)jit.info >> $@;\
+	  grep "bytes of machine code compiled" Output/$*.out-jit.info >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: jit $(RELDIR)/$*" >> $@;\
 	fi
-	-rm -f $(INFO_PREFIX)jit.info
 
 # Overall tests: just run subordinate tests
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \




From lattner at cs.uiuc.edu  Sun Aug 17 23:09:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:09:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/GenerateReport.pl
Message-ID: <200308180408.XAA25681@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

GenerateReport.pl updated: 1.11 -> 1.12

---
Log message:

Allow reports to specify a formatting function if they desire


---
Diffs of the changes:

Index: llvm/test/Programs/GenerateReport.pl
diff -u llvm/test/Programs/GenerateReport.pl:1.11 llvm/test/Programs/GenerateReport.pl:1.12
--- llvm/test/Programs/GenerateReport.pl:1.11	Fri Aug 15 14:11:02 2003
+++ llvm/test/Programs/GenerateReport.pl	Sun Aug 17 23:07:50 2003
@@ -94,7 +94,13 @@
         if (!defined($1)) {
           push @RowValues, "*";
         } else {
-          push @RowValues, $1;
+          # If there is a formatting function, run it now...
+          my $Val = $1;
+          if (scalar(@$Row) > 2) {
+            $Val = &{$Row->[2]}($Val);
+          }
+
+          push @RowValues, $Val;
         }
       }
     } else {                        # Just add a seperator...




From lattner at cs.uiuc.edu  Sun Aug 17 23:23:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:23:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/TEST.nightly.report
Message-ID: <200308180422.XAA28166@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

TEST.nightly.report updated: 1.11 -> 1.12

---
Log message:

Format times more sanely
Add a column that shows performance of LLC vs performance of GCC


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.report
diff -u llvm/test/Programs/TEST.nightly.report:1.11 llvm/test/Programs/TEST.nightly.report:1.12
--- llvm/test/Programs/TEST.nightly.report:1.11	Fri Aug 15 14:30:28 2003
+++ llvm/test/Programs/TEST.nightly.report	Sun Aug 17 23:21:57 2003
@@ -9,6 +9,25 @@
 
 my $WallTimeRE = "[A-Za-z0-9.: ]+\\(([0-9.]+) wall clock";
 
+# FormatTime - Convert a time from 1m23.45 into 83.45
+sub FormatTime {
+  my $Time = shift;
+  if ($Time =~ m/([0-9]+)m([0-9.]+)/) {
+    $Time = sprintf("%7.4f", $1*60.0+$2);
+  }
+  return $Time;
+}
+
+sub GCCLLCRatio {
+  my ($Cols, $Col) = @_;
+  if ($Cols->[$Col-2] ne "*" and $Cols->[$Col-4] ne "*" and
+      $Cols->[$Col-2] != "0") {
+    return sprintf("%3.2f%%", $Cols->[$Col-4]/$Cols->[$Col-2]);
+  } else {
+    return "n/a";
+  }
+}
+
 # These are the columns for the report.  The first entry is the header for the
 # column, the second is the regex to use to match the value.  Empty list create
 # separators, and closures may be put in for custom processing.
@@ -24,8 +43,9 @@
  ["JIT<br>codegen" , "TEST-RESULT-jit-comptime: $WallTimeRE"],
  ["Machine<br>code", 'TEST-RESULT-jit-machcode: *([0-9]+).*bytes of machine code'],
  [],
- ["GCC"      , 'TEST-RESULT-nat-time: real\s*([.0-9m]+)'],
- ["CBE"      , 'TEST-RESULT-cbe-time: real\s*([.0-9m]+)'],
- ["LLC"      , 'TEST-RESULT-llc-time: real\s*([.0-9m]+)'],
- ["JIT"      , 'TEST-RESULT-jit-time: real\s*([.0-9m]+)']
+ ["GCC"      , 'TEST-RESULT-nat-time: real\s*([.0-9m]+)', \&FormatTime],
+ ["CBE"      , 'TEST-RESULT-cbe-time: real\s*([.0-9m]+)', \&FormatTime],
+ ["LLC"      , 'TEST-RESULT-llc-time: real\s*([.0-9m]+)', \&FormatTime],
+ ["JIT"      , 'TEST-RESULT-jit-time: real\s*([.0-9m]+)', \&FormatTime],
+ ["GCC/LLC"  , \&GCCLLCRatio]
 );




From lattner at cs.uiuc.edu  Sun Aug 17 23:33:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:33:01 2003
Subject: [llvm-commits] CVS: llvm/utils/NightlyTestTemplate.html
Message-ID: <200308180432.XAA28412@apoc.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTestTemplate.html updated: 1.10 -> 1.11

---
Log message:

Add docs for new column, native tests now run with -O2


---
Diffs of the changes:

Index: llvm/utils/NightlyTestTemplate.html
diff -u llvm/utils/NightlyTestTemplate.html:1.10 llvm/utils/NightlyTestTemplate.html:1.11
--- llvm/utils/NightlyTestTemplate.html:1.10	Fri Aug 15 14:31:04 2003
+++ llvm/utils/NightlyTestTemplate.html	Sun Aug 17 23:32:34 2003
@@ -135,7 +135,7 @@
 <li><a name="Machine<br>code">Machine code</a> - The number of bytes of machine
     code generated by the JIT.</li>
 <li><a name="GCC">GCC</a> - The time taken to execute the program when compiled
-    with GCC -O3.</li>
+    with GCC -O2.</li>
 <li><a name="CBE">CBE</a> - The time taken to execute the program after
     compilation through the C Backend.</li>
 <li><a name="LLC">LLC</a> - How long does the program generated by the static
@@ -143,6 +143,8 @@
 <li><a name="JIT">JIT</a> - The amount of time spent running the
     program with the JIT; this includes the code generation phase (listed above)
     and actually running the program.</li>
+<li><a name="GCC/LLC">GCC/LLC - The speed-up of the LLC output vs the native 
+    GCC output: greater than 1 is a speedup, less than 1 is a slowdown.
 </ol><p>
 
 A complete log of testing <a href="$DATE-ProgramTest.txt.gz">is available</a>




From lattner at cs.uiuc.edu  Sun Aug 17 23:34:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:34:01 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/SingleSource/Makefile.singlesrc
Message-ID: <200308180433.XAA28435@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/SingleSource:

Makefile.singlesrc updated: 1.20 -> 1.21

---
Log message:

Compile native program with GCC -O2



---
Diffs of the changes:

Index: llvm/test/Programs/SingleSource/Makefile.singlesrc
diff -u llvm/test/Programs/SingleSource/Makefile.singlesrc:1.20 llvm/test/Programs/SingleSource/Makefile.singlesrc:1.21
--- llvm/test/Programs/SingleSource/Makefile.singlesrc:1.20	Mon Jun 16 10:50:51 2003
+++ llvm/test/Programs/SingleSource/Makefile.singlesrc	Sun Aug 17 23:33:18 2003
@@ -33,6 +33,6 @@
 
 # FIXME: LIBS should be specified, not hardcoded to -lm
 Output/%.native: %.c Output/.dir
-	$(CC) $(CFLAGS) $< -lm -o $@
+	$(CC) $(CFLAGS) -O2 $< -lm -o $@
 Output/%.native: %.cpp Output/.dir
-	$(CXX) $(CXXFLAGS) $< -lm -o $@
+	$(CXX) $(CXXFLAGS) -O2 $< -lm -o $@




From lattner at cs.uiuc.edu  Sun Aug 17 23:34:02 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:34:02 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/MultiSource/Makefile.multisrc
Message-ID: <200308180433.XAA28428@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs/MultiSource:

Makefile.multisrc updated: 1.34 -> 1.35

---
Log message:

Compile native program with GCC -O2


---
Diffs of the changes:

Index: llvm/test/Programs/MultiSource/Makefile.multisrc
diff -u llvm/test/Programs/MultiSource/Makefile.multisrc:1.34 llvm/test/Programs/MultiSource/Makefile.multisrc:1.35
--- llvm/test/Programs/MultiSource/Makefile.multisrc:1.34	Wed Jul 30 12:56:11 2003
+++ llvm/test/Programs/MultiSource/Makefile.multisrc	Sun Aug 17 23:33:15 2003
@@ -32,13 +32,13 @@
 .PRECIOUS: $(LObjects) $(NObjects) Output/%.linked.rll
 
 Output/%.o: $(SourceDir)%.c Output/.dir
-	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CFLAGS) -O2 -c $< -o $@
 
 Output/%.o: $(SourceDir)%.cpp Output/.dir
-	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
 
 Output/%.o: $(SourceDir)%.cc Output/.dir
-	$(CC) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -O2 -c $< -o $@
 
 bugpoint-gccas: Output/$(PROG).bugpoint-gccas
 bugpoint-gccld: Output/$(PROG).bugpoint-gccld




From lattner at cs.uiuc.edu  Sun Aug 17 23:40:01 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:40:01 2003
Subject: [llvm-commits] CVS: llvm/utils/NightlyTestTemplate.html
Message-ID: <200308180439.XAA28465@apoc.cs.uiuc.edu>


Changes in directory llvm/utils:

NightlyTestTemplate.html updated: 1.11 -> 1.12

---
Log message:

The CBE output is compiled at -O2


---
Diffs of the changes:

Index: llvm/utils/NightlyTestTemplate.html
diff -u llvm/utils/NightlyTestTemplate.html:1.11 llvm/utils/NightlyTestTemplate.html:1.12
--- llvm/utils/NightlyTestTemplate.html:1.11	Sun Aug 17 23:32:34 2003
+++ llvm/utils/NightlyTestTemplate.html	Sun Aug 17 23:39:41 2003
@@ -137,7 +137,7 @@
 <li><a name="GCC">GCC</a> - The time taken to execute the program when compiled
     with GCC -O2.</li>
 <li><a name="CBE">CBE</a> - The time taken to execute the program after
-    compilation through the C Backend.</li>
+    compilation through the C backend, compiled with -O2.</li>
 <li><a name="LLC">LLC</a> - How long does the program generated by the static
     backend LLC take to execute </li>
 <li><a name="JIT">JIT</a> - The amount of time spent running the




From lattner at cs.uiuc.edu  Sun Aug 17 23:40:03 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:40:03 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile.programs
Message-ID: <200308180439.XAA28456@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.85 -> 1.86

---
Log message:

Compile the CBE output at -O2


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.85 llvm/test/Programs/Makefile.programs:1.86
--- llvm/test/Programs/Makefile.programs:1.85	Fri Aug 15 14:24:38 2003
+++ llvm/test/Programs/Makefile.programs	Sun Aug 17 23:39:29 2003
@@ -251,7 +251,7 @@
 
 $(PROGRAMS_TO_TEST:%=Output/%.cbe): \
 Output/%.cbe: Output/%.cbe.c
-	-$(CC) $< $(LDFLAGS) $(CFLAGS) -o $@
+	-$(CC) $< $(LDFLAGS) $(CFLAGS) -O2 -o $@
 
 #
 # Compile a linked program to machine code with LLC.




From lattner at cs.uiuc.edu  Sun Aug 17 23:47:00 2003
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun Aug 17 23:47:00 2003
Subject: [llvm-commits] CVS: llvm/test/Programs/Makefile
Message-ID: <200308180446.XAA29376@apoc.cs.uiuc.edu>


Changes in directory llvm/test/Programs:

Makefile updated: 1.19 -> 1.20

---
Log message:

Include Makefile.programs instead of Makefile.tests, for now it's the same 

Fix spelling.  Geeze, I would have thought that Misha would have got all 
of these by now.  :)


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile
diff -u llvm/test/Programs/Makefile:1.19 llvm/test/Programs/Makefile:1.20
--- llvm/test/Programs/Makefile:1.19	Sun Aug 17 22:45:37 2003
+++ llvm/test/Programs/Makefile	Sun Aug 17 23:46:26 2003
@@ -1,6 +1,6 @@
 ##===- test/Programs/Makefile ------------------------------*- Makefile -*-===##
 #
-# This recursively traverses the programs, building them as neccesary.  This
+# This recursively traverses the programs, building them as necessary.  This
 # makefile also implements 'make report TEST=<x>'.
 #
 ##===----------------------------------------------------------------------===##
@@ -9,7 +9,7 @@
 PARALLEL_DIRS = SingleSource MultiSource External
 #LLVMSource 
 
-include ${LEVEL}/test/Makefile.tests
+include ${LEVEL}/test/Programs/Makefile.programs
 
 # Include all makefiles which define tests... These makefiles must define
 # test.<testname>.%  given input from Output/%.llvm.bc