From lattner at cs.uiuc.edu  Mon Apr 26 09:02:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Apr 26 09:02:01 2004
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/InstCombine/div.ll
Message-ID: <200404261401.JAA27614@zion.cs.uiuc.edu>


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

div.ll updated: 1.7 -> 1.8

---
Log message:

Add a new testcase for X/-1, fix bug that prevented tests from running right


---
Diffs of the changes:  (+6 -1)

Index: llvm/test/Regression/Transforms/InstCombine/div.ll
diff -u llvm/test/Regression/Transforms/InstCombine/div.ll:1.7 llvm/test/Regression/Transforms/InstCombine/div.ll:1.8
--- llvm/test/Regression/Transforms/InstCombine/div.ll:1.7	Tue Sep 16 10:29:34 2003
+++ llvm/test/Regression/Transforms/InstCombine/div.ll	Mon Apr 26 09:01:47 2004
@@ -12,10 +12,15 @@
 
 uint %test2(uint %A) {
 	%B = div uint %A, 8   ; => Shift
-	ret int %B
+	ret uint %B
 }
 
 int %test3(int %A) {
 	%B = div int 0, %A    ; => 0, don't need to keep traps
+	ret int %B
+}
+
+int %test4(int %A) {
+	%B = div int %A, -1    ; 0-A
 	ret int %B
 }




From lattner at cs.uiuc.edu  Mon Apr 26 09:02:03 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Apr 26 09:02:03 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200404261402.JAA27623@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.192 -> 1.193

---
Log message:

Instcombine X/-1 --> 0-X


---
Diffs of the changes:  (+5 -1)

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.192 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.193
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.192	Sat Apr 17 13:16:10 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Mon Apr 26 09:01:59 2004
@@ -849,10 +849,14 @@
 }
 
 Instruction *InstCombiner::visitDiv(BinaryOperator &I) {
-  // div X, 1 == X
   if (ConstantInt *RHS = dyn_cast<ConstantInt>(I.getOperand(1))) {
+    // div X, 1 == X
     if (RHS->equalsInt(1))
       return ReplaceInstUsesWith(I, I.getOperand(0));
+
+    // div X, -1 == -X
+    if (RHS->isAllOnesValue())
+      return BinaryOperator::createNeg(I.getOperand(0));
 
     // Check to see if this is an unsigned division with an exact power of 2,
     // if so, convert to a right shift.




From lattner at cs.uiuc.edu  Mon Apr 26 09:44:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Mon Apr 26 09:44:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/DataStructure/DataStructureAA.cpp
Message-ID: <200404261444.JAA28182@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/DataStructure:

DataStructureAA.cpp updated: 1.16 -> 1.17

---
Log message:

If an object is not in the scalar map then it must be a global from another
graph.


---
Diffs of the changes:  (+31 -31)

Index: llvm/lib/Analysis/DataStructure/DataStructureAA.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.16 llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.17
--- llvm/lib/Analysis/DataStructure/DataStructureAA.cpp:1.16	Fri Mar 12 00:14:22 2004
+++ llvm/lib/Analysis/DataStructure/DataStructureAA.cpp	Mon Apr 26 09:44:08 2004
@@ -111,45 +111,45 @@
 
   const DSGraph::ScalarMapTy &GSM = G.getScalarMap();
   DSGraph::ScalarMapTy::const_iterator I = GSM.find((Value*)V1);
-  if (I != GSM.end()) {
-    assert(I->second.getNode() && "Scalar map points to null node?");
-    DSGraph::ScalarMapTy::const_iterator J = GSM.find((Value*)V2);
-    if (J != GSM.end()) {
-      assert(J->second.getNode() && "Scalar map points to null node?");
+  if (I == GSM.end()) return NoAlias;
 
-      DSNode  *N1 = I->second.getNode(),  *N2 = J->second.getNode();
-      unsigned O1 = I->second.getOffset(), O2 = J->second.getOffset();
+  assert(I->second.getNode() && "Scalar map points to null node?");
+  DSGraph::ScalarMapTy::const_iterator J = GSM.find((Value*)V2);
+  if (J == GSM.end()) return NoAlias;
+
+  assert(J->second.getNode() && "Scalar map points to null node?");
+
+  DSNode  *N1 = I->second.getNode(),  *N2 = J->second.getNode();
+  unsigned O1 = I->second.getOffset(), O2 = J->second.getOffset();
         
-      // We can only make a judgment of one of the nodes is complete...
-      if (N1->isComplete() || N2->isComplete()) {
-        if (N1 != N2)
-          return NoAlias;   // Completely different nodes.
+  // We can only make a judgment of one of the nodes is complete...
+  if (N1->isComplete() || N2->isComplete()) {
+    if (N1 != N2)
+      return NoAlias;   // Completely different nodes.
 
 #if 0  // This does not correctly handle arrays!
-        // Both point to the same node and same offset, and there is only one
-        // physical memory object represented in the node, return must alias.
-        //
-        // FIXME: This isn't correct because we do not handle array indexing
-        // correctly.
+    // Both point to the same node and same offset, and there is only one
+    // physical memory object represented in the node, return must alias.
+    //
+    // FIXME: This isn't correct because we do not handle array indexing
+    // correctly.
 
-        if (O1 == O2 && isSinglePhysicalObject(N1))
-          return MustAlias; // Exactly the same object & offset
+    if (O1 == O2 && isSinglePhysicalObject(N1))
+      return MustAlias; // Exactly the same object & offset
 #endif
 
-        // See if they point to different offsets...  if so, we may be able to
-        // determine that they do not alias...
-        if (O1 != O2) {
-          if (O2 < O1) {    // Ensure that O1 <= O2
-            std::swap(V1, V2);
-            std::swap(O1, O2);
-            std::swap(V1Size, V2Size);
-          }
-
-          // FIXME: This is not correct because we do not handle array
-          // indexing correctly with this check!
-          //if (O1+V1Size <= O2) return NoAlias;
-        }
+    // See if they point to different offsets...  if so, we may be able to
+    // determine that they do not alias...
+    if (O1 != O2) {
+      if (O2 < O1) {    // Ensure that O1 <= O2
+        std::swap(V1, V2);
+        std::swap(O1, O2);
+        std::swap(V1Size, V2Size);
       }
+
+      // FIXME: This is not correct because we do not handle array
+      // indexing correctly with this check!
+      //if (O1+V1Size <= O2) return NoAlias;
     }
   }
 




From gaeke at cs.uiuc.edu  Mon Apr 26 11:26:04 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Apr 26 11:26:04 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/CallGraph.h
Message-ID: <200404261626.LAA31227@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Analysis:

CallGraph.h updated: 1.35 -> 1.36

---
Log message:

Fix a typo in a comment.


---
Diffs of the changes:  (+1 -1)

Index: llvm/include/llvm/Analysis/CallGraph.h
diff -u llvm/include/llvm/Analysis/CallGraph.h:1.35 llvm/include/llvm/Analysis/CallGraph.h:1.36
--- llvm/include/llvm/Analysis/CallGraph.h:1.35	Tue Apr 20 16:52:12 2004
+++ llvm/include/llvm/Analysis/CallGraph.h	Mon Apr 26 11:26:21 2004
@@ -41,7 +41,7 @@
 // transformations.
 //
 // The CallGraph class also attempts to figure out what the root of the
-// CallGraph is, which is currently does by looking for a function named 'main'.
+// CallGraph is, which it currently does by looking for a function named 'main'.
 // If no function named 'main' is found, the external node is used as the entry
 // node, reflecting the fact that any function without internal linkage could
 // be called into (which is common for libraries).




From gaeke at cs.uiuc.edu  Mon Apr 26 11:27:04 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Apr 26 11:27:04 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/CFGPrinter.cpp
Message-ID: <200404261627.LAA31291@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis:

CFGPrinter.cpp updated: 1.5 -> 1.6

---
Log message:

Add functions that return instances of these printer passes


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

Index: llvm/lib/Analysis/CFGPrinter.cpp
diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.5 llvm/lib/Analysis/CFGPrinter.cpp:1.6
--- llvm/lib/Analysis/CFGPrinter.cpp:1.5	Thu Dec 11 15:48:18 2003
+++ llvm/lib/Analysis/CFGPrinter.cpp	Mon Apr 26 11:27:08 2004
@@ -22,6 +22,7 @@
 #include "llvm/Function.h"
 #include "llvm/iTerminators.h"
 #include "llvm/Assembly/Writer.h"
+#include "llvm/Analysis/CFGPrinter.h"
 #include "llvm/Support/CFG.h"
 #include <sstream>
 #include <fstream>
@@ -173,3 +174,12 @@
   viewCFG();
   CFGOnly = false;
 }
+
+FunctionPass *llvm::createCFGPrinterPass () {
+  return new CFGPrinter();
+}
+
+FunctionPass *llvm::createCFGOnlyPrinterPass () {
+  return new CFGOnlyPrinter();
+}
+




From gaeke at cs.uiuc.edu  Mon Apr 26 11:28:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Apr 26 11:28:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/CFGPrinter.h
Message-ID: <200404261628.LAA31354@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Analysis:

CFGPrinter.h added (r1.1)

---
Log message:

Because I like being able to instantiate the cfgprinter from external projects,
this header file is born.


---
Diffs of the changes:  (+24 -0)

Index: llvm/include/llvm/Analysis/CFGPrinter.h
diff -c /dev/null llvm/include/llvm/Analysis/CFGPrinter.h:1.1
*** /dev/null	Mon Apr 26 11:28:03 2004
--- llvm/include/llvm/Analysis/CFGPrinter.h	Mon Apr 26 11:27:53 2004
***************
*** 0 ****
--- 1,24 ----
+ //===-- CFGPrinter.h - CFG printer external interface ------------*- C++ -*-===//
+ // 
+ //                     The LLVM Compiler Infrastructure
+ //
+ // This file was developed by the LLVM research group and is distributed under
+ // the University of Illinois Open Source License. See LICENSE.TXT for details.
+ // 
+ //===----------------------------------------------------------------------===//
+ //
+ // This file defines external functions that can be called to explicitly
+ // instantiate the CFG printer.
+ //
+ //===----------------------------------------------------------------------===//
+ 
+ #ifndef LLVM_ANALYSIS_CFGPRINTER_H
+ #define LLVM_ANALYSIS_CFGPRINTER_H
+ 
+ namespace llvm {
+   class FunctionPass;
+   FunctionPass *createCFGPrinterPass ();
+   FunctionPass *createCFGOnlyPrinterPass ();
+ } // End llvm namespace
+ 
+ #endif




From gaeke at cs.uiuc.edu  Mon Apr 26 14:48:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Apr 26 14:48:02 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200404261947.OAA01026@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.57 -> 1.58

---
Log message:

Make sure we have enough space for any register we want to save. Later
on, we should try to compact the stack layout, and not take up so much
space on every trace entry.


---
Diffs of the changes:  (+1 -1)

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.57 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.58
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.57	Wed Apr 21 16:05:31 2004
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Mon Apr 26 14:47:32 2004
@@ -266,7 +266,7 @@
   DEBUG(std::cerr << " )\n");
 
   // 2. Get some stack space: (Stack Frame Size + Space for Regs).
-  int Size = (stackSize + 32 * 8);
+  int Size = (stackSize + 104 * 8);
   E.push_back (BuildMI (V9::ADDi, 3).addMReg (sp).addSImm (-Size).addMReg (sp,
     MachineOperand::Def));
 




From gaeke at cs.uiuc.edu  Mon Apr 26 14:48:12 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Apr 26 14:48:12 2004
Subject: [llvm-commits] CVS: reopt/lib/TraceCache/InstrUtils.cpp
Message-ID: <200404261947.OAA01033@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/TraceCache:

InstrUtils.cpp updated: 1.16 -> 1.17

---
Log message:

Add and/or edit a bunch of documentation, and rewrite the instructions
for identifying SPARCv9 branches to make them readable.

Move functions around in this file to match the logical organization of
the code:  get*Target functions are together, get*Inst functions are
together, and is*Jump functions are together.


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

Index: reopt/lib/TraceCache/InstrUtils.cpp
diff -u reopt/lib/TraceCache/InstrUtils.cpp:1.16 reopt/lib/TraceCache/InstrUtils.cpp:1.17
--- reopt/lib/TraceCache/InstrUtils.cpp:1.16	Fri Apr 23 15:10:35 2004
+++ reopt/lib/TraceCache/InstrUtils.cpp	Mon Apr 26 14:47:33 2004
@@ -11,6 +11,47 @@
 
 namespace llvm {
 
+//===----------------------------------------------------------------------===//
+//===-------------- Instructions for identifying SPARCv9 branches ---------===//
+
+// Terminology:
+//
+// A NonDepJump refers to a "non-deprecated jump", i.e., one with prediction and
+// annul bits and a 19-bit PC-relative branch-target field.
+//
+// A DepJump refers to a "deprecated jump", i.e., one *without* prediction or
+// annul bits, and having a 22-bit PC-relative branch-target field.
+
+/// isNonDepJump - Returns true iff instr encodes a BPcc or FBPfcc instruction
+/// (branch on integer or floating point condition codes, respectively, with
+/// prediction and annul bits, with a 19-bit PC-relative branch target field).
+/// See SPARCv9 manual sections A.5 and A.7.
+///
+bool isNonDepJump (unsigned int instr) {
+  instr &= 0xc1c00000;
+  return (instr == 0x00400000 /* BPcc */ || instr == 0x01400000 /* FBPfcc */);
+}
+
+/// isDepJump - Returns true iff instr encodes a Bicc or FBfcc instruction
+/// (branch on integer or floating point condition codes, respectively,
+/// *without* any prediction or annul bits, with a 22-bit PC-relative branch
+/// target field). See SPARCv9 manual sections A.4 and A.6.
+///
+bool isDepJump (unsigned int instr) {
+  instr &= 0xc1c00000;
+  return (instr == 0x00800000 /* Bicc */ || instr == 0x01800000 /* FBfcc */);
+}
+
+/// isBPR - Returns true iff instr encodes a BPr (branch on integer register
+/// with prediction) instruction. See SPARCv9 manual section A.3.
+///
+bool isBPR (unsigned int instr) {
+  return (instr & 0xd1c00000) == 0x00c00000;
+}
+
+//===----------------------------------------------------------------------===//
+//===----- Instructions for extracting SPARCv9 branch target addresses ----===//
+
 uint64_t getBranchTarget(unsigned br, uint64_t pc){
   if(isNonDepJump(br))
     return getNonDepJmpTarget(br, pc);
@@ -25,6 +66,25 @@
   }
 }
 
+uint64_t getNonDepJmpTarget(unsigned int y, uint64_t oldAdd){
+  return oldAdd + 4 * (((y&0x00040000)==0x00040000)
+                       ? ((y&0x0007ffff)|0xfffffffffff80000ULL)
+                       : (y&0x0007ffff));
+}
+
+uint64_t getDepJmpTarget(unsigned int y, uint64_t oldAdd){
+  return oldAdd + 4 * (((y&0x00200000U)==0x00200000U)
+                       ? ((y&0x003fffff)|0xffffffffffc00000ULL)
+                       : (y&0x003fffff));
+}
+
+uint64_t getBPRTarget(unsigned int b, uint64_t oldAdd){
+  return (oldAdd+4*(((b&2097152)==2097152)?(0xffffffffffff0000ULL|((b&3145728)>>6)|(b&16383)):(((b&3145728)>>6)|(b&16383))));
+}
+
+//===----------------------------------------------------------------------===//
+//===----- Instructions for extracting SPARCv9 branch target addresses ----===//
+
 unsigned getBranchInst(unsigned br, uint64_t to, uint64_t frm){
   if(isNonDepJump(br))
     return getUndepJumpInstr(br, to, frm);
@@ -39,26 +99,6 @@
   }
 } 
 
-bool isNonDepJump(unsigned int y){//int + floating point
-  return ((y & 0xc1c00000) == 4194304 || (y & 0xc1c00000) == 20971520);
-}
-
-bool isDepJump(unsigned int y){ //integer+floatingpoint
-  return ((y & 0xc1c00000) == 8388608 || (y & 0xc1c00000) == 25165824);
-}
-
-uint64_t getNonDepJmpTarget(unsigned int y, uint64_t oldAdd){
-  return oldAdd + 4 * (((y&0x00040000)==0x00040000)
-                       ? ((y&0x0007ffff)|0xfffffffffff80000ULL)
-                       : (y&0x0007ffff));
-}
-
-uint64_t getDepJmpTarget(unsigned int y, uint64_t oldAdd){
-  return oldAdd + 4 * (((y&0x00200000U)==0x00200000U)
-                       ? ((y&0x003fffff)|0xffffffffffc00000ULL)
-                       : (y&0x003fffff));
-}
-
 unsigned int getUndepJumpInstr(unsigned int a, uint64_t to, uint64_t pc){
   if(to>pc)
     assert((to-pc)/4<262144 && "Can't fit target!");
@@ -70,11 +110,10 @@
   return ((a&0xfff80000U)|diff|sgn);
 }
 
-/// getDepJumpInstr - Returns a PC-relative branch instruction from
-/// address FROM to address TO of the same conditionality (BA, BN, BNE, BE,
-/// BG...) as INSTR.  INSTR must be a Bicc instruction (branch on integer
-/// condition codes with no prediction), and FROM must be its address in
-/// memory.
+/// getDepJumpInstr - Returns a PC-relative branch instruction from address
+/// FROM to address TO of the same conditionality (BA, BN, BNE, BE, BG...) as
+/// INSTR.  INSTR must be a Bicc or FBfcc instruction (branch on integer
+/// condition codes with no prediction), and FROM must be its address in memory.
 ///
 unsigned int getDepJumpInstr(unsigned int instr, uint64_t to, uint64_t from) {
   if(to>from)
@@ -91,10 +130,6 @@
   return ((instr&0xffc00000)|diff|sgn);
 }
 
-uint64_t getBPRTarget(unsigned int b, uint64_t oldAdd){
-  return (oldAdd+4*(((b&2097152)==2097152)?(0xffffffffffff0000ULL|((b&3145728)>>6)|(b&16383)):(((b&3145728)>>6)|(b&16383))));
-}
-
 unsigned int getBPRInstr(unsigned int b, uint64_t to, uint64_t frm){
   if(to>frm)
     assert((to-frm)/4 < 32768 && "Target out of range!");
@@ -146,11 +181,6 @@
 
 bool isBranchNever(unsigned int b){
   return (((b & 0xc0000000) == 0) && (((b&0x1e000000)>>25) == 0) && (isDepJump(b) || isNonDepJump(b) || isBPR(b)));
-}
-
-//BPR: (b&(2^22+2^23+2^24) == (2^22+2^23)
-bool isBPR(unsigned int b){
-  return ( (b&0x01c00000) == 0x00c00000);
 }
 
 bool isBranchInstr(unsigned int y){




From gaeke at cs.uiuc.edu  Mon Apr 26 14:51:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Apr 26 14:51:02 2004
Subject: [llvm-commits] CVS: reopt/lib/TraceCache/VirtualMem.cpp
Message-ID: <200404261950.OAA03927@kain.cs.uiuc.edu>


Changes in directory reopt/lib/TraceCache:

VirtualMem.cpp updated: 1.16 -> 1.17

---
Log message:

Document VirtualMem::writeBranchInstruction().


---
Diffs of the changes:  (+7 -3)

Index: reopt/lib/TraceCache/VirtualMem.cpp
diff -u reopt/lib/TraceCache/VirtualMem.cpp:1.16 reopt/lib/TraceCache/VirtualMem.cpp:1.17
--- reopt/lib/TraceCache/VirtualMem.cpp:1.16	Fri Apr 23 16:25:10 2004
+++ reopt/lib/TraceCache/VirtualMem.cpp	Mon Apr 26 14:49:59 2004
@@ -108,10 +108,14 @@
   }
 }
 
-//write branch inst, followed by a null inst in delay slot
-//
+/// writeBranchInstruction - Create a BA,A (Branch Always with Prediction
+/// with Annul bit set) instruction from LOCATION to TARGET, and write it to
+/// the address LOCATION.  (The annul bit is set so that the branch's delay
+/// slot instruction will be annulled.)
+///
 void VirtualMem::writeBranchInstruction(uint64_t location, uint64_t target){
-  //create branch will annul bit set
+  // The first argument to getDepJumpInstr sets the annul bit and the "always"
+  // condition.
   unsigned int instToWrite = getDepJumpInstr(0x30800000, target, location);
   writeInstToVM(location, instToWrite);
 }




From gaeke at cs.uiuc.edu  Mon Apr 26 15:04:04 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Mon Apr 26 15:04:04 2004
Subject: [llvm-commits] CVS: reopt/lib/TraceCache/InstrUtils.cpp
Message-ID: <200404262003.PAA03996@kain.cs.uiuc.edu>


Changes in directory reopt/lib/TraceCache:

InstrUtils.cpp updated: 1.17 -> 1.18

---
Log message:

Reorganize and document isCallInstr().
Reorganize getCallTarget().
Document getUndepJumpInstr() and rename its operands.
Edit getDepJumpInstr()'s comment.


---
Diffs of the changes:  (+31 -18)

Index: reopt/lib/TraceCache/InstrUtils.cpp
diff -u reopt/lib/TraceCache/InstrUtils.cpp:1.17 reopt/lib/TraceCache/InstrUtils.cpp:1.18
--- reopt/lib/TraceCache/InstrUtils.cpp:1.17	Mon Apr 26 14:47:33 2004
+++ reopt/lib/TraceCache/InstrUtils.cpp	Mon Apr 26 15:02:59 2004
@@ -49,6 +49,13 @@
   return (instr & 0xd1c00000) == 0x00c00000;
 }
 
+/// isCallInstr - Returns true iff instr encodes a CALL instruction.
+/// See SPARCv9 manual, section A.8.
+///
+bool isCallInstr (unsigned int instr) {
+  return (instr & 0xc0000000) == 0x40000000;
+}
+
 //===----------------------------------------------------------------------===//
 //===----- Instructions for extracting SPARCv9 branch target addresses ----===//
 
@@ -82,6 +89,12 @@
   return (oldAdd+4*(((b&2097152)==2097152)?(0xffffffffffff0000ULL|((b&3145728)>>6)|(b&16383)):(((b&3145728)>>6)|(b&16383))));
 }
 
+uint64_t getCallTarget(unsigned int y, uint64_t oldAdd){
+  return oldAdd + 4 * (((y&0x20000000) == 0x20000000)
+                       ? (0xffffffffc0000000ULL | (y & 0x3fffffff))
+                       : (y & 0x3fffffff));
+}
+
 //===----------------------------------------------------------------------===//
 //===----- Instructions for extracting SPARCv9 branch target addresses ----===//
 
@@ -99,21 +112,31 @@
   }
 } 
 
-unsigned int getUndepJumpInstr(unsigned int a, uint64_t to, uint64_t pc){
-  if(to>pc)
-    assert((to-pc)/4<262144 && "Can't fit target!");
+/// getUndepJumpInstr - Returns a PC-relative branch instruction from address
+/// FROM to address TO of the same conditionality (BA, BN, BNE, BE, BG...) as
+/// INSTR.  INSTR must be a BPcc or FBPfcc instruction (branch on integer
+/// condition codes with prediction and annul bits), and FROM must be its
+/// address in memory.
+///
+unsigned int getUndepJumpInstr(unsigned int instr, uint64_t to, uint64_t from) {
+  if(to>from)
+    assert((to-from)/4<262144 && "Can't fit target!");
   else 
-    assert((pc-to)/4<262144 && "Can't fit target!");
+    assert((from-to)/4<262144 && "Can't fit target!");
       
-  unsigned int diff = (((to-pc)/4)&0x3ffff);
-  unsigned int sgn = ((to < pc) ? (1 << 21) : 0);
-  return ((a&0xfff80000U)|diff|sgn);
+  // Compute new 19-bit PC-relative branch target.
+  unsigned int diff = (((to-from)/4)&0x3ffff);
+  unsigned int sgn = ((to < from) ? (1 << 21) : 0);
+
+  // Mask out the old branch target, OR in the new one, and return it.
+  return ((instr&0xfff80000U)|diff|sgn);
 }
 
 /// getDepJumpInstr - Returns a PC-relative branch instruction from address
 /// FROM to address TO of the same conditionality (BA, BN, BNE, BE, BG...) as
 /// INSTR.  INSTR must be a Bicc or FBfcc instruction (branch on integer
-/// condition codes with no prediction), and FROM must be its address in memory.
+/// condition codes with no prediction bits), and FROM must be its address in
+/// memory.
 ///
 unsigned int getDepJumpInstr(unsigned int instr, uint64_t to, uint64_t from) {
   if(to>from)
@@ -147,16 +170,6 @@
 
 //TODO: put assert to check branch destinations!
 //TODO: Take out sign bit in branch instr
-
-bool isCallInstr(unsigned int a){
-  return ((a & 0xc0000000) == 0x40000000);
-}
-
-uint64_t getCallTarget(unsigned int y, uint64_t oldAdd){
-  return oldAdd + 4 * (((y&0x20000000) == 0x20000000)
-                       ? (0xffffffffc0000000ULL | (y & 0x3fffffff))
-                       : (y & 0x3fffffff));
-}
 
 // pc is the "from" address
 unsigned int getCallInstr(uint64_t to , uint64_t pc){




From lattner at cs.uiuc.edu  Tue Apr 27 10:12:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 10:12:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/InstIterator.h
Message-ID: <200404271512.KAA12782@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Support:

InstIterator.h updated: 1.9 -> 1.10

---
Log message:

Changes to fix up the inst_iterator to pass to boost iterator checks.  This 
patch was graciously contributed by Vladimir Prus.



---
Diffs of the changes:  (+18 -15)

Index: llvm/include/llvm/Support/InstIterator.h
diff -u llvm/include/llvm/Support/InstIterator.h:1.9 llvm/include/llvm/Support/InstIterator.h:1.10
--- llvm/include/llvm/Support/InstIterator.h:1.9	Tue Nov 11 16:41:31 2003
+++ llvm/include/llvm/Support/InstIterator.h	Tue Apr 27 10:11:58 2004
@@ -33,15 +33,18 @@
   typedef _BB_i_t BBIty;
   typedef _BI_t   BIty;
   typedef _II_t   IIty;
-  _BB_t  &BBs;      // BasicBlocksType
+  _BB_t  *BBs;      // BasicBlocksType
   _BB_i_t BB;       // BasicBlocksType::iterator
   _BI_t   BI;       // BasicBlock::iterator
 public:
   typedef std::bidirectional_iterator_tag iterator_category;
   typedef IIty                            value_type;
-  typedef unsigned                        difference_type;
-  typedef BIty                            pointer;
-  typedef IIty                            reference;
+  typedef signed                        difference_type;
+  typedef IIty*                           pointer;
+  typedef IIty&                           reference;
+
+  // Default constructor
+  InstIterator() {}
 
   // Copy constructor...
   template<typename A, typename B, typename C, typename D>
@@ -53,26 +56,26 @@
     : BBs(II.BBs), BB(II.BB), BI(II.BI) {}
   
   template<class M> InstIterator(M &m) 
-    : BBs(m.getBasicBlockList()), BB(BBs.begin()) {    // begin ctor
-    if (BB != BBs.end()) {
+    : BBs(&m.getBasicBlockList()), BB(BBs->begin()) {    // begin ctor
+    if (BB != BBs->end()) {
       BI = BB->begin();
       advanceToNextBB();
     }
   }
 
   template<class M> InstIterator(M &m, bool) 
-    : BBs(m.getBasicBlockList()), BB(BBs.end()) {    // end ctor
+    : BBs(&m.getBasicBlockList()), BB(BBs->end()) {    // end ctor
   }
 
   // Accessors to get at the underlying iterators...
   inline BBIty &getBasicBlockIterator()  { return BB; }
   inline BIty  &getInstructionIterator() { return BI; }
   
-  inline IIty operator*()  const { return BI; }
-  inline IIty operator->() const { return operator*(); }
+  inline reference operator*()  const { return *BI; }
+  inline pointer operator->() const { return &operator*(); }
   
   inline bool operator==(const InstIterator &y) const { 
-    return BB == y.BB && (BB == BBs.end() || BI == y.BI);
+    return BB == y.BB && (BB == BBs->end() || BI == y.BI);
   }
   inline bool operator!=(const InstIterator& y) const { 
     return !operator==(y);
@@ -88,7 +91,7 @@
   }
     
   InstIterator& operator--() { 
-    while (BB == BBs.end() || BI == BB->begin()) {
+    while (BB == BBs->end() || BI == BB->begin()) {
       --BB;
       BI = BB->end();
     }
@@ -99,7 +102,7 @@
     InstIterator tmp = *this; --*this; return tmp; 
   }
 
-  inline bool atEnd() const { return BB == BBs.end(); }
+  inline bool atEnd() const { return BB == BBs->end(); }
 
 private:
   inline void advanceToNextBB() {
@@ -107,7 +110,7 @@
     // the end() of the current BasicBlock and there are successor BBs.
     while (BI == BB->end()) {
       ++BB;
-      if (BB == BBs.end()) break;
+      if (BB == BBs->end()) break;
       BI = BB->begin();
     }
   }
@@ -116,11 +119,11 @@
 
 typedef InstIterator<iplist<BasicBlock>,
                      Function::iterator, BasicBlock::iterator,
-                     Instruction*> inst_iterator;
+                     Instruction> inst_iterator;
 typedef InstIterator<const iplist<BasicBlock>,
                      Function::const_iterator, 
                      BasicBlock::const_iterator,
-                     const Instruction*> const_inst_iterator;
+                     const Instruction> const_inst_iterator;
 
 inline inst_iterator inst_begin(Function *F) { return inst_iterator(*F); }
 inline inst_iterator inst_end(Function *F)   { return inst_iterator(*F, true); }




From lattner at cs.uiuc.edu  Tue Apr 27 10:12:07 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 10:12:07 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/ConstantProp.cpp DCE.cpp InstructionCombining.cpp
Message-ID: <200404271512.KAA12813@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

ConstantProp.cpp updated: 1.47 -> 1.48
DCE.cpp updated: 1.52 -> 1.53
InstructionCombining.cpp updated: 1.193 -> 1.194

---
Log message:

Changes to fix up the inst_iterator to pass to boost iterator checks.  This 
patch was graciously contributed by Vladimir Prus.


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

Index: llvm/lib/Transforms/Scalar/ConstantProp.cpp
diff -u llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.47 llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.48
--- llvm/lib/Transforms/Scalar/ConstantProp.cpp:1.47	Tue Apr 13 14:28:20 2004
+++ llvm/lib/Transforms/Scalar/ConstantProp.cpp	Tue Apr 27 10:12:22 2004
@@ -49,7 +49,10 @@
 
 bool ConstantPropagation::runOnFunction(Function &F) {
   // Initialize the worklist to all of the instructions ready to process...
-  std::set<Instruction*> WorkList(inst_begin(F), inst_end(F));
+  std::set<Instruction*> WorkList;
+  for(inst_iterator i = inst_begin(F), e = inst_end(F); i != e; ++i) {
+      WorkList.insert(&*i);
+  }
   bool Changed = false;
 
   while (!WorkList.empty()) {


Index: llvm/lib/Transforms/Scalar/DCE.cpp
diff -u llvm/lib/Transforms/Scalar/DCE.cpp:1.52 llvm/lib/Transforms/Scalar/DCE.cpp:1.53
--- llvm/lib/Transforms/Scalar/DCE.cpp:1.52	Wed Apr 21 17:29:37 2004
+++ llvm/lib/Transforms/Scalar/DCE.cpp	Tue Apr 27 10:12:23 2004
@@ -76,7 +76,10 @@
 
 bool DCE::runOnFunction(Function &F) {
   // Start out with all of the instructions in the worklist...
-  std::vector<Instruction*> WorkList(inst_begin(F), inst_end(F));
+  std::vector<Instruction*> WorkList;
+  for (inst_iterator i = inst_begin(F), e = inst_end(F); i != e; ++i) {
+      WorkList.push_back(&*i);
+  }
   std::set<Instruction*> DeadInsts;
   
   // Loop over the worklist finding instructions that are dead.  If they are


Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.193 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.194
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.193	Mon Apr 26 09:01:59 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Tue Apr 27 10:12:23 2004
@@ -2934,7 +2934,10 @@
   bool Changed = false;
   TD = &getAnalysis<TargetData>();
 
-  WorkList.insert(WorkList.end(), inst_begin(F), inst_end(F));
+  for (inst_iterator i = inst_begin(F), e = inst_end(F); i != e; ++i) {
+      WorkList.push_back(&*i);
+  }
+
 
   while (!WorkList.empty()) {
     Instruction *I = WorkList.back();  // Get an instruction from the worklist




From lattner at cs.uiuc.edu  Tue Apr 27 10:13:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 10:13:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp AliasSetTracker.cpp ScalarEvolution.cpp
Message-ID: <200404271512.KAA12837@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis:

AliasAnalysisEvaluator.cpp updated: 1.12 -> 1.13
AliasSetTracker.cpp updated: 1.14 -> 1.15
ScalarEvolution.cpp updated: 1.17 -> 1.18

---
Log message:

Changes to fix up the inst_iterator to pass to boost iterator checks.  This 
patch was graciously contributed by Vladimir Prus.


---
Diffs of the changes:  (+11 -11)

Index: llvm/lib/Analysis/AliasAnalysisEvaluator.cpp
diff -u llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.12 llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.13
--- llvm/lib/Analysis/AliasAnalysisEvaluator.cpp:1.12	Fri Mar 12 10:20:49 2004
+++ llvm/lib/Analysis/AliasAnalysisEvaluator.cpp	Tue Apr 27 10:12:45 2004
@@ -83,15 +83,15 @@
       Pointers.insert(I);
 
   for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
-    if (isa<PointerType>((*I)->getType())) // Add all pointer instructions
-      Pointers.insert(*I);
-    for (User::op_iterator OI = (*I)->op_begin(); OI != (*I)->op_end(); ++OI)
+    if (isa<PointerType>(I->getType())) // Add all pointer instructions
+      Pointers.insert(&*I);
+    for (User::op_iterator OI = (*I).op_begin(); OI != (*I).op_end(); ++OI)
       if (isa<PointerType>((*OI)->getType()))
         Pointers.insert(*OI);
   }
 
   for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I) {
-    CallSite CS = CallSite::get(*I);
+    CallSite CS = CallSite::get(&*I);
     if (CS.getInstruction()) CallSites.insert(CS);
   }
 


Index: llvm/lib/Analysis/AliasSetTracker.cpp
diff -u llvm/lib/Analysis/AliasSetTracker.cpp:1.14 llvm/lib/Analysis/AliasSetTracker.cpp:1.15
--- llvm/lib/Analysis/AliasSetTracker.cpp:1.14	Wed Mar 17 17:22:04 2004
+++ llvm/lib/Analysis/AliasSetTracker.cpp	Tue Apr 27 10:12:45 2004
@@ -366,7 +366,7 @@
       Tracker = new AliasSetTracker(getAnalysis<AliasAnalysis>());
 
       for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
-        Tracker->add(*I);
+        Tracker->add(&*I);
       return false;
     }
 


Index: llvm/lib/Analysis/ScalarEvolution.cpp
diff -u llvm/lib/Analysis/ScalarEvolution.cpp:1.17 llvm/lib/Analysis/ScalarEvolution.cpp:1.18
--- llvm/lib/Analysis/ScalarEvolution.cpp:1.17	Fri Apr 23 16:29:03 2004
+++ llvm/lib/Analysis/ScalarEvolution.cpp	Tue Apr 27 10:12:45 2004
@@ -2175,22 +2175,22 @@
 
   OS << "Classifying expressions for: " << F.getName() << "\n";
   for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
-    if ((*I)->getType()->isInteger()) {
-      OS << **I;
+    if (I->getType()->isInteger()) {
+      OS << *I;
       OS << "  --> ";
-      SCEVHandle SV = getSCEV(*I);
+      SCEVHandle SV = getSCEV(&*I);
       SV->print(OS);
       OS << "\t\t";
       
-      if ((*I)->getType()->isIntegral()) {
+      if ((*I).getType()->isIntegral()) {
         ConstantRange Bounds = SV->getValueRange();
         if (!Bounds.isFullSet())
           OS << "Bounds: " << Bounds << " ";
       }
 
-      if (const Loop *L = LI.getLoopFor((*I)->getParent())) {
+      if (const Loop *L = LI.getLoopFor((*I).getParent())) {
         OS << "Exits: ";
-        SCEVHandle ExitValue = getSCEVAtScope(*I, L->getParentLoop());
+        SCEVHandle ExitValue = getSCEVAtScope(&*I, L->getParentLoop());
         if (isa<SCEVCouldNotCompute>(ExitValue)) {
           OS << "<<Unknown>>";
         } else {




From lattner at cs.uiuc.edu  Tue Apr 27 10:13:06 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 10:13:06 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp FindUsedTypes.cpp
Message-ID: <200404271512.KAA12846@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

FindUnsafePointerTypes.cpp updated: 1.21 -> 1.22
FindUsedTypes.cpp updated: 1.24 -> 1.25

---
Log message:

Changes to fix up the inst_iterator to pass to boost iterator checks.  This 
patch was graciously contributed by Vladimir Prus.



---
Diffs of the changes:  (+6 -6)

Index: llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
diff -u llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.21 llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.22
--- llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.21	Tue Nov 11 16:41:32 2003
+++ llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp	Tue Apr 27 10:12:48 2004
@@ -42,8 +42,8 @@
 PrintFailures("printunsafeptrinst", cl::Hidden,
               cl::desc("Print Unsafe Pointer Access Instructions"));
 
-static inline bool isSafeInstruction(const Instruction *I) {
-  switch (I->getOpcode()) {
+static inline bool isSafeInstruction(const Instruction &I) {
+  switch (I.getOpcode()) {
   case Instruction::Alloca:
   case Instruction::Malloc:
   case Instruction::Free:
@@ -72,7 +72,7 @@
           if (PrintFailures) {
             CachedWriter CW(F->getParent(), std::cerr);
             CW << "FindUnsafePointerTypes: Type '" << ITy
-               << "' marked unsafe in '" << F->getName() << "' by:\n" << **I;
+               << "' marked unsafe in '" << F->getName() << "' by:\n" << *I;
           }
         }
     }


Index: llvm/lib/Analysis/IPA/FindUsedTypes.cpp
diff -u llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.24 llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.25
--- llvm/lib/Analysis/IPA/FindUsedTypes.cpp:1.24	Tue Nov 11 16:41:32 2003
+++ llvm/lib/Analysis/IPA/FindUsedTypes.cpp	Tue Apr 27 10:12:48 2004
@@ -79,11 +79,11 @@
     //
     for (const_inst_iterator II = inst_begin(F), IE = inst_end(F);
          II != IE; ++II) {
-      const Instruction *I = *II;
-      const Type *Ty = I->getType();
+      const Instruction &I = *II;
+      const Type *Ty = I.getType();
     
       IncorporateType(Ty);  // Incorporate the type of the instruction
-      for (User::const_op_iterator OI = I->op_begin(), OE = I->op_end();
+      for (User::const_op_iterator OI = I.op_begin(), OE = I.op_end();
            OI != OE; ++OI)
         IncorporateValue(*OI);  // Insert inst operand types as well
     }




From lattner at cs.uiuc.edu  Tue Apr 27 10:13:13 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 10:13:13 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/SlotCalculator.cpp
Message-ID: <200404271513.KAA12883@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

SlotCalculator.cpp updated: 1.52 -> 1.53

---
Log message:

Changes to fix up the inst_iterator to pass to boost iterator checks.  This 
patch was graciously contributed by Vladimir Prus.


---
Diffs of the changes:  (+2 -2)

Index: llvm/lib/VMCore/SlotCalculator.cpp
diff -u llvm/lib/VMCore/SlotCalculator.cpp:1.52 llvm/lib/VMCore/SlotCalculator.cpp:1.53
--- llvm/lib/VMCore/SlotCalculator.cpp:1.52	Sat Feb 14 23:55:15 2004
+++ llvm/lib/VMCore/SlotCalculator.cpp	Tue Apr 27 10:13:09 2004
@@ -186,7 +186,7 @@
           if (isa<Constant>(I->getOperand(op)))
             getOrCreateSlot(I->getOperand(op));
         getOrCreateSlot(I->getType());
-        if (const VANextInst *VAN = dyn_cast<VANextInst>(*I))
+        if (const VANextInst *VAN = dyn_cast<VANextInst>(&*I))
           getOrCreateSlot(VAN->getArgType());
       }
       processSymbolTableConstants(&F->getSymbolTable());
@@ -448,7 +448,7 @@
       if (isa<Constant>(I->getOperand(op)) ||
           isa<GlobalValue>(I->getOperand(op)))
         getOrCreateCompactionTableSlot(I->getOperand(op));
-    if (const VANextInst *VAN = dyn_cast<VANextInst>(*I))
+    if (const VANextInst *VAN = dyn_cast<VANextInst>(&*I))
       getOrCreateCompactionTableSlot(VAN->getArgType());
   }
 




From lattner at cs.uiuc.edu  Tue Apr 27 10:13:16 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 10:13:16 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/CBackend/Writer.cpp
Message-ID: <200404271513.KAA12890@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/CBackend:

Writer.cpp updated: 1.168 -> 1.169

---
Log message:

Changes to fix up the inst_iterator to pass to boost iterator checks.  This 
patch was graciously contributed by Vladimir Prus.



---
Diffs of the changes:  (+5 -5)

Index: llvm/lib/Target/CBackend/Writer.cpp
diff -u llvm/lib/Target/CBackend/Writer.cpp:1.168 llvm/lib/Target/CBackend/Writer.cpp:1.169
--- llvm/lib/Target/CBackend/Writer.cpp:1.168	Wed Mar 31 23:28:26 2004
+++ llvm/lib/Target/CBackend/Writer.cpp	Tue Apr 27 10:13:11 2004
@@ -955,19 +955,19 @@
 
   // print local variable information for the function
   for (inst_iterator I = inst_begin(&F), E = inst_end(&F); I != E; ++I)
-    if (const AllocaInst *AI = isDirectAlloca(*I)) {
+    if (const AllocaInst *AI = isDirectAlloca(&*I)) {
       Out << "  ";
       printType(Out, AI->getAllocatedType(), Mang->getValueName(AI));
       Out << ";    /* Address exposed local */\n";
-    } else if ((*I)->getType() != Type::VoidTy && !isInlinableInst(**I)) {
+    } else if (I->getType() != Type::VoidTy && !isInlinableInst(*I)) {
       Out << "  ";
-      printType(Out, (*I)->getType(), Mang->getValueName(*I));
+      printType(Out, I->getType(), Mang->getValueName(&*I));
       Out << ";\n";
       
       if (isa<PHINode>(*I)) {  // Print out PHI node temporaries as well...
         Out << "  ";
-        printType(Out, (*I)->getType(),
-                  Mang->getValueName(*I)+"__PHI_TEMPORARY");
+        printType(Out, I->getType(),
+                  Mang->getValueName(&*I)+"__PHI_TEMPORARY");
         Out << ";\n";
       }
     }




From lattner at cs.uiuc.edu  Tue Apr 27 10:14:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 10:14:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
Message-ID: <200404271513.KAA12910@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9/RegAlloc:

PhyRegAlloc.cpp updated: 1.146 -> 1.147

---
Log message:

Changes to fix up the inst_iterator to pass to boost iterator checks.  This 
patch was graciously contributed by Vladimir Prus.


---
Diffs of the changes:  (+4 -4)

Index: llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp
diff -u llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.146 llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.147
--- llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp:1.146	Wed Mar 31 15:59:59 2004
+++ llvm/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.cpp	Tue Apr 27 10:13:33 2004
@@ -1167,9 +1167,9 @@
   unsigned Insn = 0;
   // Instructions themselves encoded as operand # -1
   for (const_inst_iterator II=inst_begin (Fn), IE=inst_end (Fn); II!=IE; ++II){
-    saveStateForValue (state, (*II), Insn, -1);
-    for (unsigned i = 0; i < (*II)->getNumOperands (); ++i) {
-      const Value *V = (*II)->getOperand (i);
+    saveStateForValue (state, (&*II), Insn, -1);
+    for (unsigned i = 0; i < (*II).getNumOperands (); ++i) {
+      const Value *V = (*II).getOperand (i);
       // Don't worry about it unless it's something whose reg. we'll need. 
       if (!isa<Argument> (V) && !isa<Instruction> (V)) 
         continue; 
@@ -1201,7 +1201,7 @@
   }
   int Insn = 0;
   for (const_inst_iterator II=inst_begin (Fn), IE=inst_end (Fn); II!=IE; ++II) {
-    const Instruction *I = *II;
+    const Instruction *I = &*II;
     MachineCodeForInstruction &Instrs = MachineCodeForInstruction::get (I);
     std::cerr << "Instruction: " << *I
               << "MachineCodeForInstruction:\n";




From lattner at cs.uiuc.edu  Tue Apr 27 13:22:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 13:22:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
Message-ID: <200404271822.NAA08874@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Analysis:

ScalarEvolutionExpressions.h updated: 1.2 -> 1.3

---
Log message:

Fix warning


---
Diffs of the changes:  (+1 -0)

Index: llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h
diff -u llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h:1.2 llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h:1.3
--- llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h:1.2	Fri Apr 23 16:28:25 2004
+++ llvm/include/llvm/Analysis/ScalarEvolutionExpressions.h	Tue Apr 27 13:21:56 2004
@@ -457,6 +457,7 @@
         return ((SC*)this)->visitCouldNotCompute((SCEVCouldNotCompute*)S);
       default:
         assert(0 && "Unknown SCEV type!");
+        abort();
       }
     }
 




From lattner at cs.uiuc.edu  Tue Apr 27 13:25:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Tue Apr 27 13:25:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/InstructionReader.cpp
Message-ID: <200404271824.NAA10054@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Reader:

InstructionReader.cpp updated: 1.70 -> 1.71

---
Log message:

Fix warning building in optimized mode


---
Diffs of the changes:  (+1 -0)

Index: llvm/lib/Bytecode/Reader/InstructionReader.cpp
diff -u llvm/lib/Bytecode/Reader/InstructionReader.cpp:1.70 llvm/lib/Bytecode/Reader/InstructionReader.cpp:1.71
--- llvm/lib/Bytecode/Reader/InstructionReader.cpp:1.70	Sun Apr  4 20:27:22 2004
+++ llvm/lib/Bytecode/Reader/InstructionReader.cpp	Tue Apr 27 13:24:38 2004
@@ -319,6 +319,7 @@
           IdxTy = Type::UIntTyID;
         else {
           switch (ValIdx & 3) {
+          default:
           case 0: IdxTy = Type::UIntTyID; break;
           case 1: IdxTy = Type::IntTyID; break;
           case 2: IdxTy = Type::ULongTyID; break;




From gaeke at cs.uiuc.edu  Tue Apr 27 13:35:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 13:35:01 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/ReoptimizerInternal.h
Message-ID: <200404271834.NAA06875@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

ReoptimizerInternal.h updated: 1.3 -> 1.4

---
Log message:

Copy prototypes for functions exported from RuntimeOptimizations.cpp here.


---
Diffs of the changes:  (+5 -0)

Index: reopt/lib/LightWtProfiling/ReoptimizerInternal.h
diff -u reopt/lib/LightWtProfiling/ReoptimizerInternal.h:1.3 reopt/lib/LightWtProfiling/ReoptimizerInternal.h:1.4
--- reopt/lib/LightWtProfiling/ReoptimizerInternal.h:1.3	Tue Apr 13 16:29:41 2004
+++ reopt/lib/LightWtProfiling/ReoptimizerInternal.h	Tue Apr 27 13:34:43 2004
@@ -155,6 +155,11 @@
 
 MachineCodeEmitter *createTraceOptEmitter(const TargetData &TD);
 
+// RuntimeOptimizations.cpp /////////////////////////////////////////////
+
+void addGlobalMapping(const GlobalValue *GV, uint64_t Addr);
+void optimizeTrace (std::vector<BasicBlock *> &vBB, uint64_t a);
+
 }; // end namespace llvm
 
 #endif // REOPTIMIZERINTERNAL_H




From gaeke at cs.uiuc.edu  Tue Apr 27 13:35:03 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 13:35:03 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp
Message-ID: <200404271834.NAA06882@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

RuntimeOptimizations.cpp updated: 1.29 -> 1.30

---
Log message:

Get rid of commented-out debug emitter.
Wrap long lines.
Include reopt/VirtualMem.h and reopt/InstrUtils.h.
Steal some code from the generic ExecutionEngine to use for keeping track of
where TraceFns get their code generated to (like the JIT does).
Try to add a branch from the instrumented code to the freshly-emitted 
reoptimized code.


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

Index: reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp
diff -u reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.29 reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.30
--- reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp:1.29	Fri Apr 23 15:35:53 2004
+++ reopt/lib/LightWtProfiling/RuntimeOptimizations.cpp	Tue Apr 27 13:34:44 2004
@@ -15,6 +15,8 @@
 
 #include "ReoptimizerInternal.h"
 #include "TraceToFunction.h"
+#include "reopt/VirtualMem.h"
+#include "reopt/InstrUtils.h"
 #include "Support/Debug.h"
 #include "Support/StringExtras.h"
 #include "llvm/Analysis/Verifier.h"
@@ -39,6 +41,30 @@
 extern bool SaveStateToModule;
 extern bool SaveRegAllocState;
 
+///==----- Machinery to keep track of where a TraceFunction's code is ------==//
+// This deliberately mimics the code used by ExecutionEngine, in case we ever
+// want to turn the Reoptimizer into an ExecutionEngine.
+
+/// GlobalAddressMap - A mapping between LLVM global values and their
+/// actualized version...
+std::map<const GlobalValue*, uint64_t> GlobalAddressMap;
+
+void addGlobalMapping(const GlobalValue *GV, uint64_t Addr) {
+  uint64_t &CurVal = GlobalAddressMap[GV];
+  assert((CurVal == 0 || Addr == 0) && "GlobalMapping already established!");
+  CurVal = Addr;
+}
+
+/// getPointerToGlobalIfAvailable - This returns the address of the specified
+/// global value if it is available, otherwise it returns null.
+///
+uint64_t getPointerToGlobalIfAvailable(const GlobalValue *GV) {
+  std::map<const GlobalValue*, uint64_t>::iterator I = GlobalAddressMap.find(GV);
+  return I != GlobalAddressMap.end() ? I->second : 0;
+}
+
+///==----------------------------------------------------------------------==///
+
 /// 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 the starting
@@ -59,7 +85,6 @@
   if (!Target) Target = allocateSparcV9TargetMachine (*MP->getModule (), IL);
   const TargetData &TD = Target->getTargetData ();
   if (!MCE) MCE = createTraceOptEmitter (TD);
-  //if (!MCE) MCE = MachineCodeEmitter::createDebugEmitter ();
 
   // Turn the vector of basic blocks into a Trace, and then turn the Trace into
   // a TraceFunction.
@@ -83,17 +108,21 @@
   PM.add (new TargetData (TD));
   PM.add (createVerifierPass ());
   Target->getJITInfo ()->addPassesToJITCompile (PM);
-  DEBUG(PM.add (createMachineFunctionPrinterPass (&std::cerr, "Before unpacking:\n")));
+  DEBUG(PM.add (createMachineFunctionPrinterPass (&std::cerr,
+                                                  "Before unpacking:\n")));
   PM.add (createUnpackTraceFunctionPass (Target, TF));
-  DEBUG(PM.add (createMachineFunctionPrinterPass (&std::cerr, "After unpacking:\n")));
+  DEBUG(PM.add (createMachineFunctionPrinterPass (&std::cerr,
+                                                  "After unpacking:\n")));
   Target->addPassesToEmitMachineCode (PM, *MCE);
   PM.run (*TF->TraceFn);
 
   // Add a branch from address A (the parameter to this method) to the 
   // entry basic block of the unpacked TraceFn. Future executions of the trace
   // will proceed from the optimized version of the code.
-  
-  
+  uint64_t traceStartAddr = getPointerToGlobalIfAvailable (TF->TraceFn);
+  assert (traceStartAddr && "Address of code for TraceFn was NULL after JIT?!");
+  vm->writeBranchInstruction(a, traceStartAddr);
+  doFlush (a, a + 4);
 }
 
 } // end namespace llvm




From gaeke at cs.uiuc.edu  Tue Apr 27 13:35:05 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 13:35:05 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/SecondTrigger.cpp
Message-ID: <200404271834.NAA06889@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

SecondTrigger.cpp updated: 1.28 -> 1.29

---
Log message:

Delete prototypes for functions exported from RuntimeOptimizations.cpp from here.


---
Diffs of the changes:  (+0 -2)

Index: reopt/lib/LightWtProfiling/SecondTrigger.cpp
diff -u reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.28 reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.29
--- reopt/lib/LightWtProfiling/SecondTrigger.cpp:1.28	Fri Apr  9 13:15:51 2004
+++ reopt/lib/LightWtProfiling/SecondTrigger.cpp	Tue Apr 27 13:34:45 2004
@@ -43,8 +43,6 @@
 // pair counts the number of times a given trace is *not* selected:
 static std::map<uint64_t, std::pair<long, long> > backOffCounters;
 
-extern void optimizeTrace (std::vector<BasicBlock *> &vBB, uint64_t a);
-
 std::map<uint64_t, uint64_t> firstTriggerAddr;
  
 extern "C" void llvm_time_start(){




From gaeke at cs.uiuc.edu  Tue Apr 27 13:35:07 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 13:35:07 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/TraceOptEmitter.cpp
Message-ID: <200404271834.NAA06896@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

TraceOptEmitter.cpp updated: 1.6 -> 1.7

---
Log message:

Keep track of where TraceFns get their code generated to (like the JIT does).


---
Diffs of the changes:  (+3 -0)

Index: reopt/lib/LightWtProfiling/TraceOptEmitter.cpp
diff -u reopt/lib/LightWtProfiling/TraceOptEmitter.cpp:1.6 reopt/lib/LightWtProfiling/TraceOptEmitter.cpp:1.7
--- reopt/lib/LightWtProfiling/TraceOptEmitter.cpp:1.6	Fri Apr 23 16:40:57 2004
+++ reopt/lib/LightWtProfiling/TraceOptEmitter.cpp	Tue Apr 27 13:34:46 2004
@@ -98,6 +98,9 @@
   // Round up to a 64-bit word boundary.
   CurBlock = (unsigned char*)(((intptr_t)CurFunctionPtr + 7) & ~7);
   CurByte = CurBlock;
+
+  // Remember where we started generating this function.
+  addGlobalMapping (F.getFunction (), (uint64_t) CurByte);
 }
 
 void TraceOptEmitter::finishFunction(MachineFunction &F) {




From gaeke at cs.uiuc.edu  Tue Apr 27 17:04:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 17:04:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h
Message-ID: <200404272204.RAA15042@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/SparcV9:

SparcV9RegisterInfo.h updated: 1.1 -> 1.2

---
Log message:

Integrate the rest of my random sparcv9 scribblings into this file


---
Diffs of the changes:  (+3 -2)

Index: llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h
diff -u llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h:1.1 llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h:1.2
--- llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h:1.1	Sun Apr 25 01:32:05 2004
+++ llvm/lib/Target/SparcV9/SparcV9RegisterInfo.h	Tue Apr 27 17:04:03 2004
@@ -69,11 +69,12 @@
     /* 5  */ o5, o7, l0, l1, l2,
     /* 10 */ l3, l4, l5, l6, l7,
     /* 15 */ i0, i1, i2, i3, i4,
-    /* 20 */ i5, i6, i7, g0, g1,
+    /* 20 */ i5, i6, i7, g0, g1,  // i6 is frame ptr, i7 is ret addr, g0 is zero 
     /* 25 */ g2, g3, g4, g5, g6,
-    /* 30 */ g7, o6,
+    /* 30 */ g7, o6,              // o6 is stack ptr
 
     // SparcV9FloatRegClass(FloatRegClassID)
+    // - regs 32 .. 63 are FPSingleRegType, 64 .. 95 are FPDoubleRegType
     // - unified register numbers 32 ... 95 (64 regs)
     /* 32 */ f0,  f1,  f2,
     /* 35 */ f3,  f4,  f5,  f6,  f7,




From gaeke at cs.uiuc.edu  Tue Apr 27 21:17:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 21:17:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineBasicBlock.h
Message-ID: <200404280216.VAA32256@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

MachineBasicBlock.h updated: 1.24 -> 1.25

---
Log message:

Add machine-code CFG support: MachineBasicBlocks may now have their own
predecessors and successors


---
Diffs of the changes:  (+67 -0)

Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.24 llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.25
--- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.24	Wed Mar 31 16:43:12 2004
+++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Tue Apr 27 21:16:33 2004
@@ -60,6 +60,9 @@
   Instructions Insts;
   MachineBasicBlock *Prev, *Next;
   const BasicBlock *BB;
+  std::vector<MachineBasicBlock *> Predecessors;
+  std::vector<MachineBasicBlock *> Successors;
+
 public:
   MachineBasicBlock(const BasicBlock *bb = 0) : Prev(0), Next(0), BB(bb) {
     Insts.parent = this;
@@ -94,6 +97,70 @@
   const_reverse_iterator rbegin() const { return Insts.rbegin(); }
   reverse_iterator       rend  ()       { return Insts.rend();   }
   const_reverse_iterator rend  () const { return Insts.rend();   }
+
+  // Machine-CFG iterators
+  typedef std::vector<MachineBasicBlock *>::iterator       pred_iterator;
+  typedef std::vector<MachineBasicBlock *>::const_iterator const_pred_iterator;
+  typedef std::vector<MachineBasicBlock *>::iterator       succ_iterator;
+  typedef std::vector<MachineBasicBlock *>::const_iterator const_succ_iterator;
+  
+  pred_iterator        pred_begin()       { return Predecessors.begin (); }
+  const_pred_iterator  pred_begin() const { return Predecessors.begin (); }
+  pred_iterator        pred_end()         { return Predecessors.end ();   }
+  const_pred_iterator  pred_end()   const { return Predecessors.end ();   }
+  succ_iterator        succ_begin()       { return Successors.begin ();   }
+  const_succ_iterator  succ_begin() const { return Successors.begin ();   }
+  succ_iterator        succ_end()         { return Successors.end ();     }
+  const_succ_iterator  succ_end()   const { return Successors.end ();     }
+
+  // Machine-CFG mutators
+
+  /// addSuccessor - Add succ as a successor of this MachineBasicBlock.
+  /// The Predecessors list of succ is automatically updated.
+  ///
+  void addSuccessor (MachineBasicBlock *succ) {
+    Successors.push_back (succ);
+    assert (std::find (Successors.begin (), Successors.end (), succ)
+            == Successors.end ()
+            && "Trying to addSuccessor a MBB which is already my successor");
+    succ->addPredecessor (this);
+  }
+
+  /// removeSuccessor - Remove succ from the successors list of this
+  /// MachineBasicBlock. The Predecessors list of succ is automatically updated.
+  ///
+  void removeSuccessor (MachineBasicBlock *succ) {
+    succ->removePredecessor (this);
+    std::vector<MachineBasicBlock *>::iterator goner =
+      std::find (Successors.begin(), Successors.end (), succ);
+    assert (goner != Successors.end ()
+            && "Trying to removeSuccessor a MBB which isn't my successor");
+    Successors.erase (goner);
+  }
+
+  /// addPredecessor - Remove pred as a predecessor of this MachineBasicBlock.
+  /// Don't do this unless you know what you're doing, because it doesn't
+  /// update pred's successors list. Use pred->addSuccessor instead.
+  ///
+  void addPredecessor (MachineBasicBlock *pred) {
+    Predecessors.push_back (pred);
+    assert(std::find (Predecessors.begin (), Predecessors.end (), pred)
+           == Predecessors.end ()
+           && "Trying to addPredecessor a MBB which is already my predecessor");
+  }
+
+  /// removePredecessor - Remove pred as a predecessor of this
+  /// MachineBasicBlock. Don't do this unless you know what you're
+  /// doing, because it doesn't update pred's successors list. Use
+  /// pred->removeSuccessor instead.
+  ///
+  void removePredecessor (MachineBasicBlock *pred) {
+    std::vector<MachineBasicBlock *>::iterator goner =
+      std::find (Predecessors.begin(), Predecessors.end (), pred);
+    assert (goner != Predecessors.end ()
+            && "Trying to removePredecessor a MBB which isn't my predecessor");
+    Predecessors.erase (goner);
+  }
 
   /// getFirstTerminator - returns an iterator to the first terminator
   /// instruction of this basic block. If a terminator does not exist,




From gaeke at cs.uiuc.edu  Tue Apr 27 23:00:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 23:00:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineBasicBlock.h
Message-ID: <200404280359.WAA00345@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

MachineBasicBlock.h updated: 1.25 -> 1.26

---
Log message:

Fix thinkos that Chris caught for me.
Make pred mutators private.


---
Diffs of the changes:  (+4 -2)

Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.25 llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.26
--- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.25	Tue Apr 27 21:16:33 2004
+++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Tue Apr 27 22:59:48 2004
@@ -119,10 +119,10 @@
   /// The Predecessors list of succ is automatically updated.
   ///
   void addSuccessor (MachineBasicBlock *succ) {
-    Successors.push_back (succ);
     assert (std::find (Successors.begin (), Successors.end (), succ)
             == Successors.end ()
             && "Trying to addSuccessor a MBB which is already my successor");
+    Successors.push_back (succ);
     succ->addPredecessor (this);
   }
 
@@ -138,15 +138,16 @@
     Successors.erase (goner);
   }
 
+private:
   /// addPredecessor - Remove pred as a predecessor of this MachineBasicBlock.
   /// Don't do this unless you know what you're doing, because it doesn't
   /// update pred's successors list. Use pred->addSuccessor instead.
   ///
   void addPredecessor (MachineBasicBlock *pred) {
-    Predecessors.push_back (pred);
     assert(std::find (Predecessors.begin (), Predecessors.end (), pred)
            == Predecessors.end ()
            && "Trying to addPredecessor a MBB which is already my predecessor");
+    Predecessors.push_back (pred);
   }
 
   /// removePredecessor - Remove pred as a predecessor of this
@@ -162,6 +163,7 @@
     Predecessors.erase (goner);
   }
 
+public:
   /// getFirstTerminator - returns an iterator to the first terminator
   /// instruction of this basic block. If a terminator does not exist,
   /// it returns end()




From gaeke at cs.uiuc.edu  Tue Apr 27 23:15:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 23:15:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineBasicBlock.h
Message-ID: <200404280415.XAA00524@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

MachineBasicBlock.h updated: 1.26 -> 1.27

---
Log message:

Move private methods to end of class decl at Chris's request


---
Diffs of the changes:  (+26 -26)

Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.26 llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.27
--- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.26	Tue Apr 27 22:59:48 2004
+++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Tue Apr 27 23:15:06 2004
@@ -138,32 +138,6 @@
     Successors.erase (goner);
   }
 
-private:
-  /// addPredecessor - Remove pred as a predecessor of this MachineBasicBlock.
-  /// Don't do this unless you know what you're doing, because it doesn't
-  /// update pred's successors list. Use pred->addSuccessor instead.
-  ///
-  void addPredecessor (MachineBasicBlock *pred) {
-    assert(std::find (Predecessors.begin (), Predecessors.end (), pred)
-           == Predecessors.end ()
-           && "Trying to addPredecessor a MBB which is already my predecessor");
-    Predecessors.push_back (pred);
-  }
-
-  /// removePredecessor - Remove pred as a predecessor of this
-  /// MachineBasicBlock. Don't do this unless you know what you're
-  /// doing, because it doesn't update pred's successors list. Use
-  /// pred->removeSuccessor instead.
-  ///
-  void removePredecessor (MachineBasicBlock *pred) {
-    std::vector<MachineBasicBlock *>::iterator goner =
-      std::find (Predecessors.begin(), Predecessors.end (), pred);
-    assert (goner != Predecessors.end ()
-            && "Trying to removePredecessor a MBB which isn't my predecessor");
-    Predecessors.erase (goner);
-  }
-
-public:
   /// getFirstTerminator - returns an iterator to the first terminator
   /// instruction of this basic block. If a terminator does not exist,
   /// it returns end()
@@ -193,6 +167,32 @@
   MachineBasicBlock *getNext() const { return Next; }
   void setPrev(MachineBasicBlock *P) { Prev = P; }
   void setNext(MachineBasicBlock *N) { Next = N; }
+
+  // Machine-CFG mutators
+
+  /// addPredecessor - Remove pred as a predecessor of this MachineBasicBlock.
+  /// Don't do this unless you know what you're doing, because it doesn't
+  /// update pred's successors list. Use pred->addSuccessor instead.
+  ///
+  void addPredecessor (MachineBasicBlock *pred) {
+    assert(std::find (Predecessors.begin (), Predecessors.end (), pred)
+           == Predecessors.end ()
+           && "Trying to addPredecessor a MBB which is already my predecessor");
+    Predecessors.push_back (pred);
+  }
+
+  /// removePredecessor - Remove pred as a predecessor of this
+  /// MachineBasicBlock. Don't do this unless you know what you're
+  /// doing, because it doesn't update pred's successors list. Use
+  /// pred->removeSuccessor instead.
+  ///
+  void removePredecessor (MachineBasicBlock *pred) {
+    std::vector<MachineBasicBlock *>::iterator goner =
+      std::find (Predecessors.begin(), Predecessors.end (), pred);
+    assert (goner != Predecessors.end ()
+            && "Trying to removePredecessor a MBB which isn't my predecessor");
+    Predecessors.erase (goner);
+  }
 };
 
 } // End llvm namespace




From gaeke at cs.uiuc.edu  Tue Apr 27 23:20:03 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 23:20:03 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectSimple.cpp
Message-ID: <200404280419.XAA00651@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

InstSelectSimple.cpp updated: 1.238 -> 1.239

---
Log message:

Update the machine-CFG edges whenever we see a branch.


---
Diffs of the changes:  (+5 -0)

Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.238 llvm/lib/Target/X86/InstSelectSimple.cpp:1.239
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.238	Wed Apr 14 16:27:56 2004
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Tue Apr 27 23:19:37 2004
@@ -1295,6 +1295,11 @@
 /// just make a fall-through (but we don't currently).
 ///
 void ISel::visitBranchInst(BranchInst &BI) {
+  // Update machine-CFG edges
+  BB->addSuccessor (MBBMap[BI.getSuccessor(0)]);
+  if (BI.isConditional())
+    BB->addSuccessor (MBBMap[BI.getSuccessor(1)]);
+
   BasicBlock *NextBB = getBlockAfter(BI.getParent());  // BB after current one
 
   if (!BI.isConditional()) {  // Unconditional branch?




From gaeke at cs.uiuc.edu  Tue Apr 27 23:34:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 23:34:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectSimple.cpp
Message-ID: <200404280434.XAA00815@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

InstSelectSimple.cpp updated: 1.239 -> 1.240

---
Log message:

In InsertFPRegKills(), use the machine-CFG itself rather than the
LLVM CFG when trying to find the successors of BB.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.239 llvm/lib/Target/X86/InstSelectSimple.cpp:1.240
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.239	Tue Apr 27 23:19:37 2004
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Tue Apr 27 23:34:16 2004
@@ -743,9 +743,9 @@
     // If we haven't found an FP register use or def in this basic block, check
     // to see if any of our successors has an FP PHI node, which will cause a
     // copy to be inserted into this block.
-    for (succ_const_iterator SI = succ_begin(BB->getBasicBlock()),
-           E = succ_end(BB->getBasicBlock()); SI != E; ++SI) {
-      MachineBasicBlock *SBB = MBBMap[*SI];
+    for (MachineBasicBlock::const_succ_iterator SI = BB->succ_begin(),
+         SE = BB->succ_end(); SI != SE; ++SI) {
+      MachineBasicBlock *SBB = *SI;
       for (MachineBasicBlock::iterator I = SBB->begin();
            I != SBB->end() && I->getOpcode() == X86::PHI; ++I) {
         if (RegMap.getRegClass(I->getOperand(0).getReg())->getSize() == 10)




From gaeke at cs.uiuc.edu  Tue Apr 27 23:46:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 23:46:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectSimple.cpp
Message-ID: <200404280446.XAA00973@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

InstSelectSimple.cpp updated: 1.240 -> 1.241

---
Log message:

Make RequiresFPRegKill() take a MachineBasicBlock arg.
In InsertFPRegKills(), just check the MachineBasicBlock for successors
instead of its corresponding BasicBlock.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.240 llvm/lib/Target/X86/InstSelectSimple.cpp:1.241
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.240	Tue Apr 27 23:34:16 2004
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Tue Apr 27 23:45:55 2004
@@ -684,8 +684,9 @@
 /// Note that this kill instruction will eventually be eliminated when
 /// restrictions in the stackifier are relaxed.
 ///
-static bool RequiresFPRegKill(const BasicBlock *BB) {
+static bool RequiresFPRegKill(const MachineBasicBlock *MBB) {
 #if 0
+  const BasicBlock *BB = MBB->getBasicBlock ();
   for (succ_const_iterator SI = succ_begin(BB), E = succ_end(BB); SI!=E; ++SI) {
     const BasicBlock *Succ = *SI;
     pred_const_iterator PI = pred_begin(Succ), PE = pred_end(Succ);
@@ -756,8 +757,7 @@
   UsesFPReg:
     // Okay, this block uses an FP register.  If the block has successors (ie,
     // it's not an unwind/return), insert the FP_REG_KILL instruction.
-    if (BB->getBasicBlock()->getTerminator()->getNumSuccessors() &&
-        RequiresFPRegKill(BB->getBasicBlock())) {
+    if (BB->succ_size () && RequiresFPRegKill(BB)) {
       BuildMI(*BB, BB->getFirstTerminator(), X86::FP_REG_KILL, 0);
       ++NumFPKill;
     }




From gaeke at cs.uiuc.edu  Tue Apr 27 23:47:01 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Tue Apr 27 23:47:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineBasicBlock.h
Message-ID: <200404280446.XAA01088@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

MachineBasicBlock.h updated: 1.27 -> 1.28

---
Log message:

Add pred./succ. list size methods.


---
Diffs of the changes:  (+2 -0)

Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.27 llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.28
--- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.27	Tue Apr 27 23:15:06 2004
+++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Tue Apr 27 23:46:35 2004
@@ -108,10 +108,12 @@
   const_pred_iterator  pred_begin() const { return Predecessors.begin (); }
   pred_iterator        pred_end()         { return Predecessors.end ();   }
   const_pred_iterator  pred_end()   const { return Predecessors.end ();   }
+  unsigned             pred_size()  const { return Predecessors.size ();  }
   succ_iterator        succ_begin()       { return Successors.begin ();   }
   const_succ_iterator  succ_begin() const { return Successors.begin ();   }
   succ_iterator        succ_end()         { return Successors.end ();     }
   const_succ_iterator  succ_end()   const { return Successors.end ();     }
+  unsigned             succ_size()  const { return Successors.size ();    }
 
   // Machine-CFG mutators
 




From brukman at cs.uiuc.edu  Wed Apr 28 10:31:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 10:31:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Assembly/CachedWriter.h
Message-ID: <200404281530.KAA30234@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Assembly:

CachedWriter.h updated: 1.13 -> 1.14

---
Log message:

* Add ability to get and set the output stream
* New feature: outputting a Type* as symbolic, controlled via the stream
  similarly to sending std::hex to change number format


---
Diffs of the changes:  (+23 -11)

Index: llvm/include/llvm/Assembly/CachedWriter.h
diff -u llvm/include/llvm/Assembly/CachedWriter.h:1.13 llvm/include/llvm/Assembly/CachedWriter.h:1.14
--- llvm/include/llvm/Assembly/CachedWriter.h:1.13	Thu Jan  8 16:21:58 2004
+++ llvm/include/llvm/Assembly/CachedWriter.h	Wed Apr 28 10:30:33 2004
@@ -30,12 +30,20 @@
 class CachedWriter {
   AssemblyWriter *AW;
   SlotCalculator *SC;
+  bool SymbolicTypes;
 public:
-  std::ostream &Out;
+  std::ostream *Out;
+
+  enum TypeWriter {
+    SymTypeOn,
+    SymTypeOff
+  };
+
 public:
-  CachedWriter(std::ostream &O = std::cout) : AW(0), SC(0), Out(O) { }
+  CachedWriter(std::ostream &O = std::cout)
+    : AW(0), SC(0), SymbolicTypes(false), Out(&O) { }
   CachedWriter(const Module *M, std::ostream &O = std::cout)
-    : AW(0), SC(0), Out(O) {
+    : AW(0), SC(0), SymbolicTypes(false), Out(&O) {
     setModule(M);
   }
   ~CachedWriter();
@@ -66,22 +74,26 @@
   inline CachedWriter &operator<<(const Constant *X) {
     return *this << (const Value*)X; 
   }
-  inline CachedWriter &operator<<(const Type *X) {
-    return *this << (const Value*)X;
-  }
-  inline CachedWriter &operator<<(const PointerType *X) {
-    return *this << (const Value*)X; 
-  }
+  CachedWriter &operator<<(const Type *X);
+  inline CachedWriter &operator<<(const PointerType *X);
 
   inline CachedWriter &operator<<(std::ostream &(&Manip)(std::ostream &)) {
-    Out << Manip; return *this;
+    *Out << Manip; return *this;
   }
 
   template<class X>
   inline CachedWriter &operator<<(const X &v) {
-    Out << v;
+    *Out << v;
     return *this;
   }
+
+  inline CachedWriter &operator<<(enum TypeWriter tw) {
+    SymbolicTypes = (tw == SymTypeOn);
+    return *this;
+  }
+
+  inline std::ostream& getStream() { return *Out; }
+  inline void setStream(std::ostream &os) { Out = &os; }
 };
 
 } // End llvm namespace




From brukman at cs.uiuc.edu  Wed Apr 28 10:31:05 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 10:31:05 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200404281531.KAA30264@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.126 -> 1.127

---
Log message:

* Add ability to print out type as symbolic
* Add Module accessor to AssemblyWriter


---
Diffs of the changes:  (+15 -3)

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.126 llvm/lib/VMCore/AsmWriter.cpp:1.127
--- llvm/lib/VMCore/AsmWriter.cpp:1.126	Thu Mar 11 23:53:14 2004
+++ llvm/lib/VMCore/AsmWriter.cpp	Wed Apr 28 10:31:21 2004
@@ -26,8 +26,9 @@
 #include "llvm/iPHINode.h"
 #include "llvm/iOther.h"
 #include "llvm/Module.h"
-#include "llvm/Analysis/SlotCalculator.h"
 #include "llvm/SymbolTable.h"
+#include "llvm/Analysis/SlotCalculator.h"
+#include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
 #include "Support/StringExtras.h"
 #include "Support/STLExtras.h"
@@ -474,6 +475,8 @@
 
   void writeOperand(const Value *Op, bool PrintType, bool PrintName = true);
 
+  const Module* getModule() { return TheModule; }
+
 private :
   void printModule(const Module *M);
   void printSymbolTable(const SymbolTable &ST);
@@ -1019,7 +1022,7 @@
   delete SC; delete AW;
   if (M) {
     SC = new SlotCalculator(M, false);
-    AW = new AssemblyWriter(Out, *SC, M, 0);
+    AW = new AssemblyWriter(*Out, *SC, M, 0);
   } else {
     SC = 0; AW = 0;
   }
@@ -1040,7 +1043,16 @@
   case Value::BasicBlockVal:     AW->write(cast<BasicBlock>(V)); break;
   case Value::FunctionVal:       AW->write(cast<Function>(V)); break;
   case Value::GlobalVariableVal: AW->write(cast<GlobalVariable>(V)); break;
-  default: Out << "<unknown value type: " << V->getValueType() << ">"; break;
+  default: *Out << "<unknown value type: " << V->getValueType() << ">"; break;
   }
   return *this;
+}
+
+CachedWriter& CachedWriter::operator<<(const Type *X) {
+  if (SymbolicTypes) {
+    const Module *M = AW->getModule();
+    if (M) WriteTypeSymbolic(*Out, X, M);
+    return *this;
+  } else
+    return *this << (const Value*)X;
 }




From brukman at cs.uiuc.edu  Wed Apr 28 10:32:02 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 10:32:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Bytecode/Reader/InstructionReader.cpp
Message-ID: <200404281532.KAA30296@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Bytecode/Reader:

InstructionReader.cpp updated: 1.71 -> 1.72

---
Log message:

Squelch compile-time warning (profile build).


---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Bytecode/Reader/InstructionReader.cpp
diff -u llvm/lib/Bytecode/Reader/InstructionReader.cpp:1.71 llvm/lib/Bytecode/Reader/InstructionReader.cpp:1.72
--- llvm/lib/Bytecode/Reader/InstructionReader.cpp:1.71	Tue Apr 27 13:24:38 2004
+++ llvm/lib/Bytecode/Reader/InstructionReader.cpp	Wed Apr 28 10:32:09 2004
@@ -310,7 +310,7 @@
       if (!TopTy) throw std::string("Invalid getelementptr instruction!"); 
 
       unsigned ValIdx = Args[i];
-      unsigned IdxTy;
+      unsigned IdxTy = 0;
       if (!hasRestrictedGEPTypes) {
         // Struct indices are always uints, sequential type indices can be any
         // of the 32 or 64-bit integer types.  The actual choice of type is




From gaeke at cs.uiuc.edu  Wed Apr 28 12:16:09 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Apr 28 12:16:09 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
Message-ID: <200404281715.MAA09736@zion.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

UnpackTraceFunction.cpp updated: 1.58 -> 1.59

---
Log message:

Fix usage of iterator


---
Diffs of the changes:  (+1 -1)

Index: reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp
diff -u reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.58 reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.59
--- reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp:1.58	Mon Apr 26 14:47:32 2004
+++ reopt/lib/LightWtProfiling/UnpackTraceFunction.cpp	Wed Apr 28 12:15:30 2004
@@ -364,7 +364,7 @@
   DEBUG(std::cerr << "getSavedStateIndexOfInstruction(F = " << F->getName()
         << "(), I = " << *I << ")\n");
   for (const_inst_iterator II=inst_begin (F), IE=inst_end (F); II!=IE; ++II) {
-    if (*II == I) {
+    if (&*II == I) {
       DEBUG(std::cerr << "--> returns " << Key << "\n");
       return Key;
     }




From gaeke at cs.uiuc.edu  Wed Apr 28 12:24:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Apr 28 12:24:02 2004
Subject: [llvm-commits] CVS: reopt/lib/Inst/lib/InstManip.h
Message-ID: <200404281723.MAA15814@zion.cs.uiuc.edu>


Changes in directory reopt/lib/Inst/lib:

InstManip.h updated: 1.19 -> 1.20

---
Log message:

Include Support/DataTypes.h for uint64_t.


---
Diffs of the changes:  (+1 -0)

Index: reopt/lib/Inst/lib/InstManip.h
diff -u reopt/lib/Inst/lib/InstManip.h:1.19 reopt/lib/Inst/lib/InstManip.h:1.20
--- reopt/lib/Inst/lib/InstManip.h:1.19	Wed Nov 19 14:49:53 2003
+++ reopt/lib/Inst/lib/InstManip.h	Wed Apr 28 12:23:32 2004
@@ -33,6 +33,7 @@
 #define INSTMANIP_H
 
 #include "Phase1/Intraphase.h"
+#include "Support/DataTypes.h"
 #include <algorithm>
 #include <map>
 #include <vector>




From gaeke at cs.uiuc.edu  Wed Apr 28 12:24:08 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Apr 28 12:24:08 2004
Subject: [llvm-commits] CVS: reopt/lib/Inst/lib/Makefile
Message-ID: <200404281723.MAA15821@zion.cs.uiuc.edu>


Changes in directory reopt/lib/Inst/lib:

Makefile updated: 1.5 -> 1.6

---
Log message:

Make more of the reoptimizer compile on x86.


---
Diffs of the changes:  (+8 -0)

Index: reopt/lib/Inst/lib/Makefile
diff -u reopt/lib/Inst/lib/Makefile:1.5 reopt/lib/Inst/lib/Makefile:1.6
--- reopt/lib/Inst/lib/Makefile:1.5	Thu Aug 21 14:40:58 2003
+++ reopt/lib/Inst/lib/Makefile	Wed Apr 28 12:23:33 2004
@@ -3,4 +3,12 @@
 LIBRARYNAME = perfinst
 BUILD_ARCHIVE = 1
 
+include $(LEVEL)/Makefile.config
+
+ifneq ($(ARCH),Sparc)
+Source := InstManip.cpp SparcInstManip.cpp
+all ::
+	@echo "This code assumes an LP64 machine- please ignore ptr cast warnings!"
+endif
+
 include $(LEVEL)/Makefile.common




From gaeke at cs.uiuc.edu  Wed Apr 28 12:28:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Apr 28 12:28:02 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/Makefile
Message-ID: <200404281727.MAA20931@zion.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

Makefile updated: 1.4 -> 1.5

---
Log message:

Make more of the reoptimizer compile under x86 (albeit with warnings)


---
Diffs of the changes:  (+9 -0)

Index: reopt/lib/LightWtProfiling/Makefile
diff -u reopt/lib/LightWtProfiling/Makefile:1.4 reopt/lib/LightWtProfiling/Makefile:1.5
--- reopt/lib/LightWtProfiling/Makefile:1.4	Thu Aug 21 14:40:59 2003
+++ reopt/lib/LightWtProfiling/Makefile	Wed Apr 28 12:27:36 2004
@@ -2,4 +2,13 @@
 LEVEL = ../..
 LIBRARYNAME = firstTrigger
 
+include $(LEVEL)/Makefile.config
+
+ifneq ($(ARCH),Sparc)
+Source := Initialization.cpp RuntimeOptimizations.cpp SLI.cpp Trace.cpp TraceOptEmitter.cpp TraceToFunction.cpp UnpackTraceFunction.cpp scheduler.cpp
+all ::
+	@echo "This code assumes an LP64 machine- please ignore ptr cast warnings!"
+endif
+
+
 include $(LEVEL)/Makefile.common




From gaeke at cs.uiuc.edu  Wed Apr 28 12:28:07 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Apr 28 12:28:07 2004
Subject: [llvm-commits] CVS: reopt/lib/Makefile
Message-ID: <200404281727.MAA20938@zion.cs.uiuc.edu>


Changes in directory reopt/lib:

Makefile updated: 1.18 -> 1.19

---
Log message:

Make more of the reoptimizer compile under x86 (albeit with warnings)


---
Diffs of the changes:  (+1 -6)

Index: reopt/lib/Makefile
diff -u reopt/lib/Makefile:1.18 reopt/lib/Makefile:1.19
--- reopt/lib/Makefile:1.18	Wed Apr  7 00:08:15 2004
+++ reopt/lib/Makefile	Wed Apr 28 12:27:36 2004
@@ -1,16 +1,11 @@
 LEVEL = ..
-DIRS := BinInterface Mapping TraceCache Trigger
+DIRS := BinInterface Mapping TraceCache Trigger LightWtProfiling Inst
 
 include $(LEVEL)/Makefile.config
 
 # Mac OS X assembler doesn't love the dummy function.
 ifneq ($(ARCH),PowerPC)
 DIRS := $(DIRS) ScratchMemory
-endif
-
-# These dirs contain files that don't currently compile under Linux/x86:
-ifeq ($(ARCH),Sparc)
-DIRS := $(DIRS) Inst LightWtProfiling 
 endif
 
 include $(LEVEL)/Makefile.common




From brukman at cs.uiuc.edu  Wed Apr 28 13:53:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 13:53:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
Message-ID: <200404281852.NAA20061@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

FindUnsafePointerTypes.cpp updated: 1.22 -> 1.23

---
Log message:

Send text and numbers directly to CachedWriter's contained ostream.


---
Diffs of the changes:  (+2 -1)

Index: llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp
diff -u llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.22 llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.23
--- llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp:1.22	Tue Apr 27 10:12:48 2004
+++ llvm/lib/Analysis/IPA/FindUnsafePointerTypes.cpp	Wed Apr 28 13:52:43 2004
@@ -98,7 +98,8 @@
   for (std::set<PointerType*>::const_iterator I = getUnsafeTypes().begin(), 
          E = getUnsafeTypes().end(); I != E; ++I, ++Counter) {
     
-    CW << " #" << Counter << ". " << (Value*)*I << "\n";
+    o << " #" << Counter << ". ";
+    CW << (Value*)*I << "\n";
   }
 }
 




From brukman at cs.uiuc.edu  Wed Apr 28 14:23:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 14:23:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Assembly/CachedWriter.h
Message-ID: <200404281923.OAA29723@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Assembly:

CachedWriter.h updated: 1.14 -> 1.15

---
Log message:

* Make contained ostream not public.
* Remove various print methods that called the Value* method, just have one that
  all subclasses of Value will use anyway.
* Remove template for printing constant references
* Add methods to print char* and strings
* setStream now sets the stream on the contained AssemblyWriter


---
Diffs of the changes:  (+11 -26)

Index: llvm/include/llvm/Assembly/CachedWriter.h
diff -u llvm/include/llvm/Assembly/CachedWriter.h:1.14 llvm/include/llvm/Assembly/CachedWriter.h:1.15
--- llvm/include/llvm/Assembly/CachedWriter.h:1.14	Wed Apr 28 10:30:33 2004
+++ llvm/include/llvm/Assembly/CachedWriter.h	Wed Apr 28 14:22:58 2004
@@ -31,15 +31,14 @@
   AssemblyWriter *AW;
   SlotCalculator *SC;
   bool SymbolicTypes;
-public:
   std::ostream *Out;
 
+public:
   enum TypeWriter {
     SymTypeOn,
     SymTypeOff
   };
 
-public:
   CachedWriter(std::ostream &O = std::cout)
     : AW(0), SC(0), SymbolicTypes(false), Out(&O) { }
   CachedWriter(const Module *M, std::ostream &O = std::cout)
@@ -53,27 +52,10 @@
 
   CachedWriter &operator<<(const Value *V);
 
-  inline CachedWriter &operator<<(Value *X) {
-    return *this << (const Value*)X;
-  }
-  inline CachedWriter &operator<<(const GlobalVariable *X) {
-    return *this << (const Value*)X;
-  }
-  inline CachedWriter &operator<<(const Function *X) {
-    return *this << (const Value*)X;
-  }
-  inline CachedWriter &operator<<(const Argument *X) {
-    return *this << (const Value*)X;
-  }
-  inline CachedWriter &operator<<(const BasicBlock *X) {
-    return *this << (const Value*)X;
-  }
-  inline CachedWriter &operator<<(const Instruction *X) {
-    return *this << (const Value*)X; 
-  }
-  inline CachedWriter &operator<<(const Constant *X) {
-    return *this << (const Value*)X; 
+  inline CachedWriter &operator<<(const Value &X) {
+    return *this << &X;
   }
+
   CachedWriter &operator<<(const Type *X);
   inline CachedWriter &operator<<(const PointerType *X);
 
@@ -81,9 +63,12 @@
     *Out << Manip; return *this;
   }
 
-  template<class X>
-  inline CachedWriter &operator<<(const X &v) {
-    *Out << v;
+  inline CachedWriter& operator<<(const char *X) {
+    *Out << X;
+    return *this;
+  }
+  inline CachedWriter& operator<<(const std::string &X) {
+    *Out << X;
     return *this;
   }
 
@@ -93,7 +78,7 @@
   }
 
   inline std::ostream& getStream() { return *Out; }
-  inline void setStream(std::ostream &os) { Out = &os; }
+  void setStream(std::ostream &os);
 };
 
 } // End llvm namespace




From brukman at cs.uiuc.edu  Wed Apr 28 14:24:03 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 14:24:03 2004
Subject: [llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp
Message-ID: <200404281924.OAA29746@zion.cs.uiuc.edu>


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.127 -> 1.128

---
Log message:

class AssemblyWriter:
* Make contained ostream pointer, not reference
* Allow setting of that ostream via setStream()

class CachedWriter:
* setStream() in turn calls setStream() on the AssemblyWriter


---
Diffs of the changes:  (+109 -103)

Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.127 llvm/lib/VMCore/AsmWriter.cpp:1.128
--- llvm/lib/VMCore/AsmWriter.cpp:1.127	Wed Apr 28 10:31:21 2004
+++ llvm/lib/VMCore/AsmWriter.cpp	Wed Apr 28 14:24:28 2004
@@ -449,7 +449,7 @@
 namespace llvm {
 
 class AssemblyWriter {
-  std::ostream &Out;
+  std::ostream *Out;
   SlotCalculator &Table;
   const Module *TheModule;
   std::map<const Type *, std::string> TypeNames;
@@ -457,7 +457,7 @@
 public:
   inline AssemblyWriter(std::ostream &o, SlotCalculator &Tab, const Module *M,
                         AssemblyAnnotationWriter *AAW)
-    : Out(o), Table(Tab), TheModule(M), AnnotationWriter(AAW) {
+    : Out(&o), Table(Tab), TheModule(M), AnnotationWriter(AAW) {
 
     // If the module has a symbol table, take all global types and stuff their
     // names into the TypeNames map.
@@ -476,6 +476,7 @@
   void writeOperand(const Value *Op, bool PrintType, bool PrintName = true);
 
   const Module* getModule() { return TheModule; }
+  void setStream(std::ostream &os) { Out = &os; }
 
 private :
   void printModule(const Module *M);
@@ -491,7 +492,7 @@
   // symbolic version of a type name.
   //
   std::ostream &printType(const Type *Ty) {
-    return printTypeInt(Out, Ty, TypeNames);
+    return printTypeInt(*Out, Ty, TypeNames);
   }
 
   // printTypeAtLeastOneLevel - Print out one level of the possibly complex type
@@ -514,55 +515,55 @@
     for (FunctionType::param_iterator I = FTy->param_begin(),
            E = FTy->param_end(); I != E; ++I) {
       if (I != FTy->param_begin())
-        Out << ", ";
+        *Out << ", ";
       printType(*I);
     }
     if (FTy->isVarArg()) {
-      if (FTy->getNumParams()) Out << ", ";
-      Out << "...";
+      if (FTy->getNumParams()) *Out << ", ";
+      *Out << "...";
     }
-    Out << ")";
+    *Out << ")";
   } else if (const StructType *STy = dyn_cast<StructType>(Ty)) {
-    Out << "{ ";
+    *Out << "{ ";
     for (StructType::element_iterator I = STy->element_begin(),
            E = STy->element_end(); I != E; ++I) {
       if (I != STy->element_begin())
-        Out << ", ";
+        *Out << ", ";
       printType(*I);
     }
-    Out << " }";
+    *Out << " }";
   } else if (const PointerType *PTy = dyn_cast<PointerType>(Ty)) {
     printType(PTy->getElementType()) << "*";
   } else if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
-    Out << "[" << ATy->getNumElements() << " x ";
+    *Out << "[" << ATy->getNumElements() << " x ";
     printType(ATy->getElementType()) << "]";
   } else if (const OpaqueType *OTy = dyn_cast<OpaqueType>(Ty)) {
-    Out << "opaque";
+    *Out << "opaque";
   } else {
     if (!Ty->isPrimitiveType())
-      Out << "<unknown derived type>";
+      *Out << "<unknown derived type>";
     printType(Ty);
   }
-  return Out;
+  return *Out;
 }
 
 
 void AssemblyWriter::writeOperand(const Value *Operand, bool PrintType, 
 				  bool PrintName) {
-  if (PrintType) { Out << " "; printType(Operand->getType()); }
-  WriteAsOperandInternal(Out, Operand, PrintName, TypeNames, &Table);
+  if (PrintType) { *Out << " "; printType(Operand->getType()); }
+  WriteAsOperandInternal(*Out, Operand, PrintName, TypeNames, &Table);
 }
 
 
 void AssemblyWriter::printModule(const Module *M) {
   switch (M->getEndianness()) {
-  case Module::LittleEndian: Out << "target endian = little\n"; break;
-  case Module::BigEndian:    Out << "target endian = big\n";    break;
+  case Module::LittleEndian: *Out << "target endian = little\n"; break;
+  case Module::BigEndian:    *Out << "target endian = big\n";    break;
   case Module::AnyEndianness: break;
   }
   switch (M->getPointerSize()) {
-  case Module::Pointer32:    Out << "target pointersize = 32\n"; break;
-  case Module::Pointer64:    Out << "target pointersize = 64\n"; break;
+  case Module::Pointer32:    *Out << "target pointersize = 32\n"; break;
+  case Module::Pointer64:    *Out << "target pointersize = 64\n"; break;
   case Module::AnyPointerSize: break;
   }
   
@@ -572,7 +573,7 @@
   for (Module::const_giterator I = M->gbegin(), E = M->gend(); I != E; ++I)
     printGlobal(I);
 
-  Out << "\nimplementation   ; Functions:\n";
+  *Out << "\nimplementation   ; Functions:\n";
   
   // Output all of the functions...
   for (Module::const_iterator I = M->begin(), E = M->end(); I != E; ++I)
@@ -580,27 +581,27 @@
 }
 
 void AssemblyWriter::printGlobal(const GlobalVariable *GV) {
-  if (GV->hasName()) Out << getLLVMName(GV->getName()) << " = ";
+  if (GV->hasName()) *Out << getLLVMName(GV->getName()) << " = ";
 
   if (!GV->hasInitializer()) 
-    Out << "external ";
+    *Out << "external ";
   else
     switch (GV->getLinkage()) {
-    case GlobalValue::InternalLinkage:  Out << "internal "; break;
-    case GlobalValue::LinkOnceLinkage:  Out << "linkonce "; break;
-    case GlobalValue::WeakLinkage:      Out << "weak "; break;
-    case GlobalValue::AppendingLinkage: Out << "appending "; break;
+    case GlobalValue::InternalLinkage:  *Out << "internal "; break;
+    case GlobalValue::LinkOnceLinkage:  *Out << "linkonce "; break;
+    case GlobalValue::WeakLinkage:      *Out << "weak "; break;
+    case GlobalValue::AppendingLinkage: *Out << "appending "; break;
     case GlobalValue::ExternalLinkage: break;
     }
 
-  Out << (GV->isConstant() ? "constant " : "global ");
+  *Out << (GV->isConstant() ? "constant " : "global ");
   printType(GV->getType()->getElementType());
 
   if (GV->hasInitializer())
     writeOperand(GV->getInitializer(), false, false);
 
   printInfoComment(*GV);
-  Out << "\n";
+  *Out << "\n";
 }
 
 
@@ -618,7 +619,7 @@
 	printConstant(CPV);
       } else if (const Type *Ty = dyn_cast<Type>(V)) {
         assert(Ty->getType() == Type::TypeTy && TI->first == Type::TypeTy);
-	Out << "\t" << getLLVMName(I->first) << " = type ";
+	*Out << "\t" << getLLVMName(I->first) << " = type ";
 
         // Make sure we print out at least one level of the type structure, so
         // that we do not get %FILE = type %FILE
@@ -637,40 +638,40 @@
   if (!CPV->hasName()) return;
 
   // Print out name...
-  Out << "\t" << getLLVMName(CPV->getName()) << " =";
+  *Out << "\t" << getLLVMName(CPV->getName()) << " =";
 
   // Write the value out now...
   writeOperand(CPV, true, false);
 
   printInfoComment(*CPV);
-  Out << "\n";
+  *Out << "\n";
 }
 
 /// printFunction - Print all aspects of a function.
 ///
 void AssemblyWriter::printFunction(const Function *F) {
   // Print out the return type and name...
-  Out << "\n";
+  *Out << "\n";
 
-  if (AnnotationWriter) AnnotationWriter->emitFunctionAnnot(F, Out);
+  if (AnnotationWriter) AnnotationWriter->emitFunctionAnnot(F, *Out);
 
   if (F->isExternal())
-    Out << "declare ";
+    *Out << "declare ";
   else
     switch (F->getLinkage()) {
-    case GlobalValue::InternalLinkage:  Out << "internal "; break;
-    case GlobalValue::LinkOnceLinkage:  Out << "linkonce "; break;
-    case GlobalValue::WeakLinkage:      Out << "weak "; break;
-    case GlobalValue::AppendingLinkage: Out << "appending "; break;
+    case GlobalValue::InternalLinkage:  *Out << "internal "; break;
+    case GlobalValue::LinkOnceLinkage:  *Out << "linkonce "; break;
+    case GlobalValue::WeakLinkage:      *Out << "weak "; break;
+    case GlobalValue::AppendingLinkage: *Out << "appending "; break;
     case GlobalValue::ExternalLinkage: break;
     }
 
   printType(F->getReturnType()) << " ";
   if (!F->getName().empty())
-    Out << getLLVMName(F->getName());
+    *Out << getLLVMName(F->getName());
   else
-    Out << "\"\"";
-  Out << "(";
+    *Out << "\"\"";
+  *Out << "(";
   Table.incorporateFunction(F);
 
   // Loop over the arguments, printing them...
@@ -681,21 +682,21 @@
 
   // Finish printing arguments...
   if (FT->isVarArg()) {
-    if (FT->getNumParams()) Out << ", ";
-    Out << "...";  // Output varargs portion of signature!
+    if (FT->getNumParams()) *Out << ", ";
+    *Out << "...";  // Output varargs portion of signature!
   }
-  Out << ")";
+  *Out << ")";
 
   if (F->isExternal()) {
-    Out << "\n";
+    *Out << "\n";
   } else {
-    Out << " {";
+    *Out << " {";
   
     // Output all of its basic blocks... for the function
     for (Function::const_iterator I = F->begin(), E = F->end(); I != E; ++I)
       printBasicBlock(I);
 
-    Out << "}\n";
+    *Out << "}\n";
   }
 
   Table.purgeFunction();
@@ -706,62 +707,62 @@
 ///
 void AssemblyWriter::printArgument(const Argument *Arg) {
   // Insert commas as we go... the first arg doesn't get a comma
-  if (Arg != &Arg->getParent()->afront()) Out << ", ";
+  if (Arg != &Arg->getParent()->afront()) *Out << ", ";
 
   // Output type...
   printType(Arg->getType());
   
   // Output name, if available...
   if (Arg->hasName())
-    Out << " " << getLLVMName(Arg->getName());
+    *Out << " " << getLLVMName(Arg->getName());
   else if (Table.getSlot(Arg) < 0)
-    Out << "<badref>";
+    *Out << "<badref>";
 }
 
 /// printBasicBlock - This member is called for each basic block in a method.
 ///
 void AssemblyWriter::printBasicBlock(const BasicBlock *BB) {
   if (BB->hasName()) {              // Print out the label if it exists...
-    Out << "\n" << BB->getName() << ":";
+    *Out << "\n" << BB->getName() << ":";
   } else if (!BB->use_empty()) {      // Don't print block # of no uses...
     int Slot = Table.getSlot(BB);
-    Out << "\n; <label>:";
+    *Out << "\n; <label>:";
     if (Slot >= 0) 
-      Out << Slot;         // Extra newline separates out label's
+      *Out << Slot;         // Extra newline separates out label's
     else 
-      Out << "<badref>"; 
+      *Out << "<badref>"; 
   }
 
   if (BB->getParent() == 0)
-    Out << "\t\t; Error: Block without parent!";
+    *Out << "\t\t; Error: Block without parent!";
   else {
     if (BB != &BB->getParent()->front()) {  // Not the entry block?
       // Output predecessors for the block...
-      Out << "\t\t;";
+      *Out << "\t\t;";
       pred_const_iterator PI = pred_begin(BB), PE = pred_end(BB);
       
       if (PI == PE) {
-        Out << " No predecessors!";
+        *Out << " No predecessors!";
       } else {
-        Out << " preds =";
+        *Out << " preds =";
         writeOperand(*PI, false, true);
         for (++PI; PI != PE; ++PI) {
-          Out << ",";
+          *Out << ",";
           writeOperand(*PI, false, true);
         }
       }
     }
   }
   
-  Out << "\n";
+  *Out << "\n";
 
-  if (AnnotationWriter) AnnotationWriter->emitBasicBlockStartAnnot(BB, Out);
+  if (AnnotationWriter) AnnotationWriter->emitBasicBlockStartAnnot(BB, *Out);
 
   // Output all of the instructions in the basic block...
   for (BasicBlock::const_iterator I = BB->begin(), E = BB->end(); I != E; ++I)
     printInstruction(*I);
 
-  if (AnnotationWriter) AnnotationWriter->emitBasicBlockEndAnnot(BB, Out);
+  if (AnnotationWriter) AnnotationWriter->emitBasicBlockEndAnnot(BB, *Out);
 }
 
 
@@ -770,36 +771,36 @@
 ///
 void AssemblyWriter::printInfoComment(const Value &V) {
   if (V.getType() != Type::VoidTy) {
-    Out << "\t\t; <";
+    *Out << "\t\t; <";
     printType(V.getType()) << ">";
 
     if (!V.hasName()) {
       int Slot = Table.getSlot(&V); // Print out the def slot taken...
-      if (Slot >= 0) Out << ":" << Slot;
-      else Out << ":<badref>";
+      if (Slot >= 0) *Out << ":" << Slot;
+      else *Out << ":<badref>";
     }
-    Out << " [#uses=" << V.use_size() << "]";  // Output # uses
+    *Out << " [#uses=" << V.use_size() << "]";  // Output # uses
   }
 }
 
 /// printInstruction - This member is called for each Instruction in a method.
 ///
 void AssemblyWriter::printInstruction(const Instruction &I) {
-  if (AnnotationWriter) AnnotationWriter->emitInstructionAnnot(&I, Out);
+  if (AnnotationWriter) AnnotationWriter->emitInstructionAnnot(&I, *Out);
 
-  Out << "\t";
+  *Out << "\t";
 
   // Print out name if it exists...
   if (I.hasName())
-    Out << getLLVMName(I.getName()) << " = ";
+    *Out << getLLVMName(I.getName()) << " = ";
 
   // If this is a volatile load or store, print out the volatile marker
   if ((isa<LoadInst>(I)  && cast<LoadInst>(I).isVolatile()) ||
       (isa<StoreInst>(I) && cast<StoreInst>(I).isVolatile()))
-      Out << "volatile ";
+      *Out << "volatile ";
 
   // Print out the opcode...
-  Out << I.getOpcodeName();
+  *Out << I.getOpcodeName();
 
   // Print out the type of the operands...
   const Value *Operand = I.getNumOperands() ? I.getOperand(0) : 0;
@@ -807,35 +808,35 @@
   // Special case conditional branches to swizzle the condition out to the front
   if (isa<BranchInst>(I) && I.getNumOperands() > 1) {
     writeOperand(I.getOperand(2), true);
-    Out << ",";
+    *Out << ",";
     writeOperand(Operand, true);
-    Out << ",";
+    *Out << ",";
     writeOperand(I.getOperand(1), true);
 
   } else if (isa<SwitchInst>(I)) {
     // Special case switch statement to get formatting nice and correct...
-    writeOperand(Operand        , true); Out << ",";
-    writeOperand(I.getOperand(1), true); Out << " [";
+    writeOperand(Operand        , true); *Out << ",";
+    writeOperand(I.getOperand(1), true); *Out << " [";
 
     for (unsigned op = 2, Eop = I.getNumOperands(); op < Eop; op += 2) {
-      Out << "\n\t\t";
-      writeOperand(I.getOperand(op  ), true); Out << ",";
+      *Out << "\n\t\t";
+      writeOperand(I.getOperand(op  ), true); *Out << ",";
       writeOperand(I.getOperand(op+1), true);
     }
-    Out << "\n\t]";
+    *Out << "\n\t]";
   } else if (isa<PHINode>(I)) {
-    Out << " ";
+    *Out << " ";
     printType(I.getType());
-    Out << " ";
+    *Out << " ";
 
     for (unsigned op = 0, Eop = I.getNumOperands(); op < Eop; op += 2) {
-      if (op) Out << ", ";
-      Out << "[";  
-      writeOperand(I.getOperand(op  ), false); Out << ",";
-      writeOperand(I.getOperand(op+1), false); Out << " ]";
+      if (op) *Out << ", ";
+      *Out << "[";  
+      writeOperand(I.getOperand(op  ), false); *Out << ",";
+      writeOperand(I.getOperand(op+1), false); *Out << " ]";
     }
   } else if (isa<ReturnInst>(I) && !Operand) {
-    Out << " void";
+    *Out << " void";
   } else if (isa<CallInst>(I)) {
     const PointerType  *PTy = cast<PointerType>(Operand->getType());
     const FunctionType *FTy = cast<FunctionType>(PTy->getElementType());
@@ -848,19 +849,19 @@
     if (!FTy->isVarArg() &&
         (!isa<PointerType>(RetTy) || 
          !isa<FunctionType>(cast<PointerType>(RetTy)->getElementType()))) {
-      Out << " "; printType(RetTy);
+      *Out << " "; printType(RetTy);
       writeOperand(Operand, false);
     } else {
       writeOperand(Operand, true);
     }
-    Out << "(";
+    *Out << "(";
     if (I.getNumOperands() > 1) writeOperand(I.getOperand(1), true);
     for (unsigned op = 2, Eop = I.getNumOperands(); op < Eop; ++op) {
-      Out << ",";
+      *Out << ",";
       writeOperand(I.getOperand(op), true);
     }
 
-    Out << " )";
+    *Out << " )";
   } else if (const InvokeInst *II = dyn_cast<InvokeInst>(&I)) {
     const PointerType  *PTy = cast<PointerType>(Operand->getType());
     const FunctionType *FTy = cast<FunctionType>(PTy->getElementType());
@@ -873,42 +874,42 @@
     if (!FTy->isVarArg() &&
         (!isa<PointerType>(RetTy) || 
          !isa<FunctionType>(cast<PointerType>(RetTy)->getElementType()))) {
-      Out << " "; printType(RetTy);
+      *Out << " "; printType(RetTy);
       writeOperand(Operand, false);
     } else {
       writeOperand(Operand, true);
     }
 
-    Out << "(";
+    *Out << "(";
     if (I.getNumOperands() > 3) writeOperand(I.getOperand(3), true);
     for (unsigned op = 4, Eop = I.getNumOperands(); op < Eop; ++op) {
-      Out << ",";
+      *Out << ",";
       writeOperand(I.getOperand(op), true);
     }
 
-    Out << " )\n\t\t\tto";
+    *Out << " )\n\t\t\tto";
     writeOperand(II->getNormalDest(), true);
-    Out << " unwind";
+    *Out << " unwind";
     writeOperand(II->getUnwindDest(), true);
 
   } else if (const AllocationInst *AI = dyn_cast<AllocationInst>(&I)) {
-    Out << " ";
+    *Out << " ";
     printType(AI->getType()->getElementType());
     if (AI->isArrayAllocation()) {
-      Out << ",";
+      *Out << ",";
       writeOperand(AI->getArraySize(), true);
     }
   } else if (isa<CastInst>(I)) {
     if (Operand) writeOperand(Operand, true);   // Work with broken code
-    Out << " to ";
+    *Out << " to ";
     printType(I.getType());
   } else if (isa<VAArgInst>(I)) {
     if (Operand) writeOperand(Operand, true);   // Work with broken code
-    Out << ", ";
+    *Out << ", ";
     printType(I.getType());
   } else if (const VANextInst *VAN = dyn_cast<VANextInst>(&I)) {
     if (Operand) writeOperand(Operand, true);   // Work with broken code
-    Out << ", ";
+    *Out << ", ";
     printType(VAN->getArgType());
   } else if (Operand) {   // Print the normal way...
 
@@ -933,18 +934,18 @@
     }
     
     if (!PrintAllTypes) {
-      Out << " ";
+      *Out << " ";
       printType(TheType);
     }
 
     for (unsigned i = 0, E = I.getNumOperands(); i != E; ++i) {
-      if (i) Out << ",";
+      if (i) *Out << ",";
       writeOperand(I.getOperand(i), PrintAllTypes);
     }
   }
 
   printInfoComment(I);
-  Out << "\n";
+  *Out << "\n";
 }
 
 
@@ -1055,4 +1056,9 @@
     return *this;
   } else
     return *this << (const Value*)X;
+}
+
+void CachedWriter::setStream(std::ostream &os) {
+  Out = &os;
+  if (AW) AW->setStream(os);
 }




From brukman at cs.uiuc.edu  Wed Apr 28 14:36:26 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 14:36:26 2004
Subject: [llvm-commits] CVS: llvm/utils/emacs/llvm-mode.el
Message-ID: <200404281936.OAA01020@zion.cs.uiuc.edu>


Changes in directory llvm/utils/emacs:

llvm-mode.el updated: 1.12 -> 1.13

---
Log message:

Added `zeroinitializer' keyword.


---
Diffs of the changes:  (+1 -1)

Index: llvm/utils/emacs/llvm-mode.el
diff -u llvm/utils/emacs/llvm-mode.el:1.12 llvm/utils/emacs/llvm-mode.el:1.13
--- llvm/utils/emacs/llvm-mode.el:1.12	Thu Mar 11 23:54:48 2004
+++ llvm/utils/emacs/llvm-mode.el	Wed Apr 28 14:36:08 2004
@@ -25,7 +25,7 @@
    ;; Hex constants
    '("0x[0-9A-Fa-f]+" . font-lock-preprocessor-face)
    ;; Keywords
-   '("begin\\|end\\|true\\|false\\|declare\\|global\\|constant\\|const\\|internal\\|linkonce\\|weak\\|appending\\|uninitialized\\|implementation\\|\\.\\.\\.\\|null\\|to\\|except\\|not\\|target\\|endian\\|little\\|big\\|pointersize\\|volatile" . font-lock-keyword-face)
+   '("begin\\|end\\|true\\|false\\|zeroinitializer\\|declare\\|global\\|constant\\|const\\|internal\\|linkonce\\|weak\\|appending\\|uninitialized\\|implementation\\|\\.\\.\\.\\|null\\|to\\|except\\|not\\|target\\|endian\\|little\\|big\\|pointersize\\|volatile" . font-lock-keyword-face)
    ;; Types
    '("void\\|bool\\|sbyte\\|ubyte\\|u?short\\|u?int\\|u?long\\|float\\|double\\|type\\|label\\|opaque" . font-lock-type-face)
    ;; Arithmetic and Logical Operators




From brukman at cs.uiuc.edu  Wed Apr 28 14:36:33 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 14:36:33 2004
Subject: [llvm-commits] CVS: llvm/utils/vim/llvm.vim
Message-ID: <200404281935.OAA00979@zion.cs.uiuc.edu>


Changes in directory llvm/utils/vim:

llvm.vim updated: 1.10 -> 1.11

---
Log message:

Added `zeroinitializer' keyword.


---
Diffs of the changes:  (+1 -1)

Index: llvm/utils/vim/llvm.vim
diff -u llvm/utils/vim/llvm.vim:1.10 llvm/utils/vim/llvm.vim:1.11
--- llvm/utils/vim/llvm.vim:1.10	Thu Mar 11 23:55:07 2004
+++ llvm/utils/vim/llvm.vim	Wed Apr 28 14:35:32 2004
@@ -24,7 +24,7 @@
 syn keyword llvmStatement ret br switch invoke unwind
 syn keyword llvmStatement malloc alloca free load store getelementptr
 
-syn keyword llvmStatement begin end true false
+syn keyword llvmStatement begin end true false zeroinitializer
 syn keyword llvmStatement declare global constant const
 syn keyword llvmStatement internal uninitialized external implementation
 syn keyword llvmStatement linkonce weak appending




From gaeke at cs.uiuc.edu  Wed Apr 28 16:42:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Wed Apr 28 16:42:02 2004
Subject: [llvm-commits] CVS: reopt/lib/LightWtProfiling/TraceOptEmitter.cpp
Message-ID: <200404282141.QAA25874@seraph.cs.uiuc.edu>


Changes in directory reopt/lib/LightWtProfiling:

TraceOptEmitter.cpp updated: 1.7 -> 1.8

---
Log message:

Wrap long lines.
The parameters to writeInstToVM() were backwards!!! Fixed.
Widen the doFlush range used after every write.
Make sure that all code addresses are always held in variables that are
64 bits wide. Don't cast back and forth between pointers and integers
unnecessarily.


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

Index: reopt/lib/LightWtProfiling/TraceOptEmitter.cpp
diff -u reopt/lib/LightWtProfiling/TraceOptEmitter.cpp:1.7 reopt/lib/LightWtProfiling/TraceOptEmitter.cpp:1.8
--- reopt/lib/LightWtProfiling/TraceOptEmitter.cpp:1.7	Tue Apr 27 13:34:46 2004
+++ reopt/lib/LightWtProfiling/TraceOptEmitter.cpp	Wed Apr 28 16:41:09 2004
@@ -44,8 +44,8 @@
 
     // CurBlock - The start of the current block of memory.  CurByte - The
     // current byte being emitted to.
-    unsigned char *CurBlock, *CurByte;
-    unsigned char *FunctionBase, *CurFunctionPtr;
+    uint64_t CurBlock, CurByte;
+    uint64_t FunctionBase, CurFunctionPtr;
 
     // ConstantPoolAddresses - Contains the location for each entry in the
     // constant pool.
@@ -54,7 +54,7 @@
     TraceOptEmitter (const TargetData &_TD) : TD (_TD) {
       // Re-use the existing DummyFunction area for code emission in the
       // Reoptimizer.  No memory is reserved for stubs.
-      FunctionBase = (unsigned char *) OptimizedTraceTextArea;
+      FunctionBase = (uint64_t) OptimizedTraceTextArea;
       // Allocate functions forward from the function base.
       CurFunctionPtr = FunctionBase;
     }
@@ -96,11 +96,11 @@
 
 void TraceOptEmitter::startFunction(MachineFunction &F) {
   // Round up to a 64-bit word boundary.
-  CurBlock = (unsigned char*)(((intptr_t)CurFunctionPtr + 7) & ~7);
+  CurBlock = (CurFunctionPtr + 7) & ~7;
   CurByte = CurBlock;
 
   // Remember where we started generating this function.
-  addGlobalMapping (F.getFunction (), (uint64_t) CurByte);
+  addGlobalMapping (F.getFunction (), CurByte);
 }
 
 void TraceOptEmitter::finishFunction(MachineFunction &F) {
@@ -109,8 +109,8 @@
 
   ConstantPoolAddresses.clear();
 
-  DEBUG(std::cerr << "Finished CodeGen of [" << (void*)CurBlock
-                  << "] Function: " << F.getFunction()->getName()
+  DEBUG(std::cerr << "Finished CodeGen of [0x" << std::hex << CurBlock
+                  << std::dec << "] Function: " << F.getFunction()->getName()
                   << ": " << CurByte-CurBlock << " bytes of text\n");
 }
 
@@ -155,7 +155,9 @@
 }
 
 void TraceOptEmitter::emitByte(unsigned char B) {
-  std::cerr << "TraceOptEmitter: attempt to emit a single byte: 0x" << std::hex << (unsigned)B << std::dec << " at cursor: " << (unsigned)(uintptr_t)CurByte << "\n";
+  std::cerr << "TraceOptEmitter: attempt to emit a single byte: 0x"
+            << std::hex << (unsigned)B << std::dec << " at cursor: "
+            << CurByte << "\n";
   abort ();
   // *CurByte = W;
   ++CurByte;
@@ -165,24 +167,23 @@
   // This won't work if the endianness of the host and target don't agree!  (For
   // a JIT this can't happen though.  :)
   std::cerr << "TraceOptEmitter: emitting word 0x" << std::hex << W
-            << " at cursor: " << (uint64_t)(uintptr_t)CurByte << std::dec
-            << "\n";
-  vm->writeInstToVM (W, (uint64_t) CurByte);  // does: *(unsigned*)CurByte = W;
-  doFlush ((uint64_t) CurByte, (uint64_t) CurByte + sizeof (unsigned));
+            << " at cursor: " << CurByte << std::dec << "\n";
+  vm->writeInstToVM (CurByte, W);  // does: *(unsigned*)CurByte = W;
+  doFlush (CurByte - sizeof (unsigned), (uint64_t) CurByte + sizeof (unsigned));
   CurByte += sizeof(unsigned);
 }
 
 void TraceOptEmitter::emitWordAt(unsigned W, unsigned *Ptr) {
   std::cerr << "TraceOptEmitter: emitting word 0x" << std::hex << W
             << std::dec << " at pointer: " << Ptr << "\n";
-  vm->writeInstToVM (W, (uint64_t) Ptr);  // does: *Ptr = W;
-  doFlush ((uint64_t) Ptr, (uint64_t) Ptr + sizeof (unsigned));
+  vm->writeInstToVM ((uint64_t) Ptr, W);  // does: *Ptr = W;
+  doFlush ((uint64_t) Ptr - sizeof (unsigned), (uint64_t) Ptr + sizeof (unsigned));
 }
 
 uint64_t TraceOptEmitter::getGlobalValueAddress(GlobalValue *V) {
-  intptr_t Result = 0;
+  uint64_t Result = 0;
   if (V->hasName ()) {
-    Result = (intptr_t)GetAddressOfSymbol (V->getName ());
+    Result = (uint64_t)GetAddressOfSymbol (V->getName ());
   }
   if (!Result) {
     std::cerr << "TraceOptEmitter can't find address of GlobalValue: " << *V;
@@ -192,8 +193,8 @@
 }
 
 uint64_t TraceOptEmitter::getGlobalValueAddress(const std::string &Name) {
-  intptr_t Result = 0;
-  Result = (intptr_t)GetAddressOfSymbol (Name);
+  uint64_t Result = 0;
+  Result = (uint64_t)GetAddressOfSymbol (Name);
   if (!Result) {
     std::cerr << "TraceOptEmitter can't find address of \"" << Name << "\"\n";
     abort ();
@@ -215,7 +216,7 @@
 // will be output to.
 //
 uint64_t TraceOptEmitter::getCurrentPCValue() {
-  return (intptr_t)CurByte;
+  return CurByte;
 }
 
 uint64_t TraceOptEmitter::forceCompilationOf(Function *F) {




From brukman at cs.uiuc.edu  Wed Apr 28 23:05:01 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 23:05:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/CFGPrinter.cpp
Message-ID: <200404290404.XAA03502@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis:

CFGPrinter.cpp updated: 1.6 -> 1.7

---
Log message:

Reorder #includes as per style guide.


---
Diffs of the changes:  (+3 -3)

Index: llvm/lib/Analysis/CFGPrinter.cpp
diff -u llvm/lib/Analysis/CFGPrinter.cpp:1.6 llvm/lib/Analysis/CFGPrinter.cpp:1.7
--- llvm/lib/Analysis/CFGPrinter.cpp:1.6	Mon Apr 26 11:27:08 2004
+++ llvm/lib/Analysis/CFGPrinter.cpp	Wed Apr 28 23:04:47 2004
@@ -17,13 +17,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "Support/GraphWriter.h"
-#include "llvm/Pass.h"
 #include "llvm/Function.h"
 #include "llvm/iTerminators.h"
-#include "llvm/Assembly/Writer.h"
+#include "llvm/Pass.h"
 #include "llvm/Analysis/CFGPrinter.h"
+#include "llvm/Assembly/Writer.h"
 #include "llvm/Support/CFG.h"
+#include "Support/GraphWriter.h"
 #include <sstream>
 #include <fstream>
 using namespace llvm;




From brukman at cs.uiuc.edu  Wed Apr 28 23:05:05 2004
From: brukman at cs.uiuc.edu (Misha Brukman)
Date: Wed Apr 28 23:05:05 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/DataStructure/DataStructure.cpp TopDownClosure.cpp
Message-ID: <200404290405.XAA03526@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/DataStructure:

DataStructure.cpp updated: 1.172 -> 1.173
TopDownClosure.cpp updated: 1.66 -> 1.67

---
Log message:

Wrapped code and comments at 80 cols; doxygenified some comments.


---
Diffs of the changes:  (+20 -18)

Index: llvm/lib/Analysis/DataStructure/DataStructure.cpp
diff -u llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.172 llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.173
--- llvm/lib/Analysis/DataStructure/DataStructure.cpp:1.172	Fri Mar 12 19:14:23 2004
+++ llvm/lib/Analysis/DataStructure/DataStructure.cpp	Wed Apr 28 23:05:30 2004
@@ -464,7 +464,8 @@
   // If we found our type exactly, early exit
   if (SubType == NewTy) return false;
 
-  // Differing function types don't require us to merge.  They are not values anyway.
+  // Differing function types don't require us to merge.  They are not values
+  // anyway.
   if (isa<FunctionType>(SubType) &&
       isa<FunctionType>(NewTy)) return false;
 
@@ -555,9 +556,9 @@
 
 
 
-// addEdgeTo - Add an edge from the current node to the specified node.  This
-// can cause merging of nodes in the graph.
-//
+/// addEdgeTo - Add an edge from the current node to the specified node.  This
+/// can cause merging of nodes in the graph.
+///
 void DSNode::addEdgeTo(unsigned Offset, const DSNodeHandle &NH) {
   if (NH.isNull()) return;       // Nothing to do
 
@@ -571,10 +572,10 @@
 }
 
 
-// MergeSortedVectors - Efficiently merge a vector into another vector where
-// duplicates are not allowed and both are sorted.  This assumes that 'T's are
-// efficiently copyable and have sane comparison semantics.
-//
+/// MergeSortedVectors - Efficiently merge a vector into another vector where
+/// duplicates are not allowed and both are sorted.  This assumes that 'T's are
+/// efficiently copyable and have sane comparison semantics.
+///
 static void MergeSortedVectors(std::vector<GlobalValue*> &Dest,
                                const std::vector<GlobalValue*> &Src) {
   // By far, the most common cases will be the simple ones.  In these cases,
@@ -722,14 +723,14 @@
 }
 
 
-// mergeWith - Merge this node and the specified node, moving all links to and
-// from the argument node into the current node, deleting the node argument.
-// Offset indicates what offset the specified node is to be merged into the
-// current node.
-//
-// The specified node may be a null pointer (in which case, we update it to
-// point to this node).
-//
+/// mergeWith - Merge this node and the specified node, moving all links to and
+/// from the argument node into the current node, deleting the node argument.
+/// Offset indicates what offset the specified node is to be merged into the
+/// current node.
+///
+/// The specified node may be a null pointer (in which case, we update it to
+/// point to this node).
+///
 void DSNode::mergeWith(const DSNodeHandle &NH, unsigned Offset) {
   DSNode *N = NH.getNode();
   if (N == this && NH.getOffset() == Offset)


Index: llvm/lib/Analysis/DataStructure/TopDownClosure.cpp
diff -u llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.66 llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.67
--- llvm/lib/Analysis/DataStructure/TopDownClosure.cpp:1.66	Sat Feb  7 19:51:48 2004
+++ llvm/lib/Analysis/DataStructure/TopDownClosure.cpp	Wed Apr 28 23:05:30 2004
@@ -62,9 +62,10 @@
   // globals graph.
   const DSScalarMap &GGSM = GlobalsGraph->getScalarMap();
   hash_set<DSNode*> Visited;
-  for (DSScalarMap::global_iterator I = GGSM.global_begin(), E = GGSM.global_end();
+  for (DSScalarMap::global_iterator I=GGSM.global_begin(), E=GGSM.global_end();
        I != E; ++I)
-    markReachableFunctionsExternallyAccessible(GGSM.find(*I)->second.getNode(), Visited);
+    markReachableFunctionsExternallyAccessible(GGSM.find(*I)->second.getNode(),
+                                               Visited);
 
   // Loop over unresolved call nodes.  Any functions passed into (but not
   // returned!) from unresolvable call nodes may be invoked outside of the




From gaeke at cs.uiuc.edu  Thu Apr 29 12:44:02 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Thu Apr 29 12:44:02 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/CFG.h
Message-ID: <200404291744.MAA20393@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Support:

CFG.h updated: 1.18 -> 1.19

---
Log message:

Add machine-CFG graph traits specializations.


---
Diffs of the changes:  (+124 -0)

Index: llvm/include/llvm/Support/CFG.h
diff -u llvm/include/llvm/Support/CFG.h:1.18 llvm/include/llvm/Support/CFG.h:1.19
--- llvm/include/llvm/Support/CFG.h:1.18	Tue Nov 11 16:41:31 2003
+++ llvm/include/llvm/Support/CFG.h	Thu Apr 29 12:43:55 2004
@@ -17,6 +17,7 @@
 
 #include "Support/GraphTraits.h"
 #include "llvm/Function.h"
+#include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/InstrTypes.h"
 #include "Support/iterator"
 
@@ -263,6 +264,129 @@
   public GraphTraits<Inverse<const BasicBlock*> > {
   static NodeType *getEntryNode(Inverse<const Function *> G) {
     return &G.Graph->getEntryBlock();
+  }
+};
+
+//===--------------------------------------------------------------------===//
+// GraphTraits specializations for machine basic block graphs (machine-CFGs)
+//===--------------------------------------------------------------------===//
+
+// Provide specializations of GraphTraits to be able to treat a
+// MachineFunction as a graph of MachineBasicBlocks...
+//
+
+template <> struct GraphTraits<MachineBasicBlock *> {
+  typedef MachineBasicBlock NodeType;
+  typedef MachineBasicBlock::succ_iterator ChildIteratorType;
+
+  static NodeType *getEntryNode(MachineBasicBlock *BB) { return BB; }
+  static inline ChildIteratorType child_begin(NodeType *N) { 
+    return N->succ_begin();
+  }
+  static inline ChildIteratorType child_end(NodeType *N) { 
+    return N->succ_end();
+  }
+};
+
+template <> struct GraphTraits<const MachineBasicBlock *> {
+  typedef const MachineBasicBlock NodeType;
+  typedef MachineBasicBlock::const_succ_iterator ChildIteratorType;
+
+  static NodeType *getEntryNode(const MachineBasicBlock *BB) { return BB; }
+  static inline ChildIteratorType child_begin(NodeType *N) { 
+    return N->succ_begin();
+  }
+  static inline ChildIteratorType child_end(NodeType *N) { 
+    return N->succ_end();
+  }
+};
+
+// Provide specializations of GraphTraits to be able to treat a
+// MachineFunction as a graph of MachineBasicBlocks... and to walk it
+// in inverse order.  Inverse order for a function is considered
+// to be when traversing the predecessor edges of a MBB
+// instead of the successor edges.
+//
+template <> struct GraphTraits<Inverse<MachineBasicBlock*> > {
+  typedef MachineBasicBlock NodeType;
+  typedef MachineBasicBlock::pred_iterator ChildIteratorType;
+  static NodeType *getEntryNode(Inverse<MachineBasicBlock *> G) {
+    return G.Graph;
+  }
+  static inline ChildIteratorType child_begin(NodeType *N) { 
+    return N->pred_begin();
+  }
+  static inline ChildIteratorType child_end(NodeType *N) { 
+    return N->pred_end();
+  }
+};
+
+template <> struct GraphTraits<Inverse<const MachineBasicBlock*> > {
+  typedef const MachineBasicBlock NodeType;
+  typedef MachineBasicBlock::const_pred_iterator ChildIteratorType;
+  static NodeType *getEntryNode(Inverse<const MachineBasicBlock*> G) {
+    return G.Graph; 
+  }
+  static inline ChildIteratorType child_begin(NodeType *N) { 
+    return N->pred_begin();
+  }
+  static inline ChildIteratorType child_end(NodeType *N) { 
+    return N->pred_end();
+  }
+};
+
+
+//===--------------------------------------------------------------------===//
+// GraphTraits specializations for MachineFunction bb graphs (machine-CFGs)
+//===--------------------------------------------------------------------===//
+
+// Provide specializations of GraphTraits to be able to treat a
+// MachineFunction as a graph of MachineBasicBlocks... these are the
+// same as the MachineBasicBlock iterators, except that the root node
+// is implicitly the first node of the MachineFunction.
+//
+template <> struct GraphTraits<MachineFunction*> :
+  public GraphTraits<MachineBasicBlock*> {
+  static NodeType *getEntryNode(MachineFunction *F) {
+    return &F->front();
+  }
+  // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
+  typedef MachineFunction::iterator nodes_iterator;
+  static nodes_iterator nodes_begin(MachineFunction *F) { return F->begin(); }
+  static nodes_iterator nodes_end  (MachineFunction *F) { return F->end(); }
+};
+template <> struct GraphTraits<const MachineFunction*> :
+  public GraphTraits<const MachineBasicBlock*> {
+  static NodeType *getEntryNode(const MachineFunction *F) {
+    return &F->front();
+  }
+  // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
+  typedef MachineFunction::const_iterator nodes_iterator;
+  static nodes_iterator nodes_begin(const MachineFunction *F) {
+    return F->begin();
+  }
+  static nodes_iterator nodes_end  (const MachineFunction *F) {
+    return F->end();
+  }
+};
+
+
+// Provide specializations of GraphTraits to be able to treat a
+// MachineFunction as a graph of MachineBasicBlocks... and to walk it
+// in inverse order.  Inverse order for a MachineFunction is considered
+// to be when traversing the predecessor edges of a MBB instead of the
+// successor edges.
+//
+template <> struct GraphTraits<Inverse<MachineFunction*> > :
+  public GraphTraits<Inverse<MachineBasicBlock*> > {
+  static NodeType *getEntryNode(Inverse<MachineFunction*> G) {
+    return &G.Graph->front();
+  }
+};
+template <> struct GraphTraits<Inverse<const MachineFunction*> > :
+  public GraphTraits<Inverse<const MachineBasicBlock*> > {
+  static NodeType *getEntryNode(Inverse<const MachineFunction *> G) {
+    return &G.Graph->front();
   }
 };
 




From lattner at cs.uiuc.edu  Thu Apr 29 23:38:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Thu Apr 29 23:38:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200404300438.XAA31214@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.194 -> 1.195

---
Log message:

Fix a major pessimization in the instcombiner.  If an allocation instruction
is only used by a cast, and the casted type is the same size as the original
allocation, it would eliminate the cast by folding it into the allocation.

Unfortunately, it was placing the new allocation instruction right before
the cast, which could pull (for example) alloca instructions into the body
of a function.  This turns statically allocatable allocas into expensive
dynamically allocated allocas, which is bad bad bad.

This fixes the problem by placing the new allocation instruction at the same
place the old one was, duh. :)



---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.194 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.195
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.194	Tue Apr 27 10:12:23 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Thu Apr 29 23:37:52 2004
@@ -2035,7 +2035,7 @@
             New = new MallocInst(CastElTy, Amt, Name);
           else
             New = new AllocaInst(CastElTy, Amt, Name);
-          InsertNewInstBefore(New, CI);
+          InsertNewInstBefore(New, *AI);
           return ReplaceInstUsesWith(CI, New);
         }
       }




From lattner at cs.uiuc.edu  Fri Apr 30 09:13:04 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Apr 30 09:13:04 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200404301413.JAA08089@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.167 -> 1.168

---
Log message:

Fix a broken link


---
Diffs of the changes:  (+2 -2)

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.167 llvm/docs/ReleaseNotes.html:1.168
--- llvm/docs/ReleaseNotes.html:1.167	Wed Apr 21 13:52:06 2004
+++ llvm/docs/ReleaseNotes.html	Fri Apr 30 09:13:16 2004
@@ -12,8 +12,8 @@
 <ol>
   <li><a href="#intro">Introduction</a></li>
   <li><a href="#whatsnew">What's New?</a></li>
+  <li><a href="GettingStartedGuide.html">Installation Instructions</a></li>
   <li><a href="#portability">Portability and Supported Platforms</a></li>
-  <li><a href="#install-instructions">Installation Instructions</a></li>
   <li><a href="#knownproblems">Known Problems</a>
   <ul>
     <li><a href="#experimental">Experimental features included in this
@@ -611,7 +611,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/04/21 18:52:06 $
+  Last modified: $Date: 2004/04/30 14:13:16 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Fri Apr 30 09:14:58 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Apr 30 09:14:58 2004
Subject: [llvm-commits] CVS: llvm-www/releases/1.2/docs/ReleaseNotes.html
Message-ID: <200404301414.JAA08641@zion.cs.uiuc.edu>


Changes in directory llvm-www/releases/1.2/docs:

ReleaseNotes.html updated: 1.9 -> 1.10

---
Log message:

Fix a broken link


---
Diffs of the changes:  (+2 -2)

Index: llvm-www/releases/1.2/docs/ReleaseNotes.html
diff -u llvm-www/releases/1.2/docs/ReleaseNotes.html:1.9 llvm-www/releases/1.2/docs/ReleaseNotes.html:1.10
--- llvm-www/releases/1.2/docs/ReleaseNotes.html:1.9	Wed Apr 21 13:52:19 2004
+++ llvm-www/releases/1.2/docs/ReleaseNotes.html	Fri Apr 30 09:14:06 2004
@@ -15,7 +15,7 @@
   <li><a href="#intro">Introduction</a></li>
   <li><a href="#whatsnew">What's New?</a></li>
   <li><a href="#portability">Portability and Supported Platforms</a></li>
-  <li><a href="#install-instructions">Installation Instructions</a></li>
+  <li><a href="GettingStartedGuide.html">Installation Instructions</a></li>
   <li><a href="#knownproblems">Known Problems</a>
   <ul>
     <li><a href="#experimental">Experimental features included with this release</a>
@@ -675,7 +675,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/04/21 18:52:19 $
+  Last modified: $Date: 2004/04/30 14:14:06 $
 </address>
 
 </body>




From tbrethou at cs.uiuc.edu  Fri Apr 30 15:41:04 2004
From: tbrethou at cs.uiuc.edu (Tanya Brethour)
Date: Fri Apr 30 15:41:04 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetSchedInfo.h
Message-ID: <200404302040.PAA02801@seraph.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetSchedInfo.h updated: 1.22 -> 1.23

---
Log message:

Removing MachineResource class.


---
Diffs of the changes:  (+5 -15)

Index: llvm/include/llvm/Target/TargetSchedInfo.h
diff -u llvm/include/llvm/Target/TargetSchedInfo.h:1.22 llvm/include/llvm/Target/TargetSchedInfo.h:1.23
--- llvm/include/llvm/Target/TargetSchedInfo.h:1.22	Sun Feb 29 02:40:03 2004
+++ llvm/include/llvm/Target/TargetSchedInfo.h	Fri Apr 30 15:40:38 2004
@@ -62,24 +62,15 @@
 
 typedef unsigned resourceId_t;
 
-struct MachineResource {
+struct CPUResource {
   const std::string rname;
   resourceId_t rid;
+  int maxNumUsers;   // MAXINT if no restriction
   
-  MachineResource(const std::string &resourceName)
-    : rname(resourceName), rid(nextId++) {}
-  
+  CPUResource(const std::string& resourceName, int maxUsers)
+    : rname(resourceName), rid(nextId++), maxNumUsers(maxUsers) {}
 private:
   static resourceId_t nextId;
-  MachineResource();			// disable
-};
-
-
-struct CPUResource : public MachineResource {
-  int maxNumUsers;   // MAXINT if no restriction
-  
-  CPUResource(const std::string& rname, int maxUsers)
-    : MachineResource(rname), maxNumUsers(maxUsers) {}
 };
 
 
@@ -312,8 +303,7 @@
 
 
 
-  friend class ModuloSchedGraph;
-  friend class ModuloScheduling;
+  friend class ModuloSchedulingPass;
   
 };
 




From tbrethou at cs.uiuc.edu  Fri Apr 30 15:41:11 2004
From: tbrethou at cs.uiuc.edu (Tanya Brethour)
Date: Fri Apr 30 15:41:11 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetSchedInfo.cpp
Message-ID: <200404302040.PAA02787@seraph.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

TargetSchedInfo.cpp updated: 1.14 -> 1.15

---
Log message:

Removing MachineResource class.


---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Target/TargetSchedInfo.cpp
diff -u llvm/lib/Target/TargetSchedInfo.cpp:1.14 llvm/lib/Target/TargetSchedInfo.cpp:1.15
--- llvm/lib/Target/TargetSchedInfo.cpp:1.14	Sun Feb 29 00:31:16 2004
+++ llvm/lib/Target/TargetSchedInfo.cpp	Fri Apr 30 15:39:59 2004
@@ -17,7 +17,7 @@
 
 namespace llvm {
 
-resourceId_t MachineResource::nextId = 0;
+resourceId_t CPUResource::nextId = 0;
 
 // Check if fromRVec and toRVec have *any* common entries.
 // Assume the vectors are sorted in increasing order.




From tbrethou at cs.uiuc.edu  Fri Apr 30 15:47:01 2004
From: tbrethou at cs.uiuc.edu (Tanya Brethour)
Date: Fri Apr 30 15:47:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetSchedInfo.h
Message-ID: <200404302046.PAA04986@seraph.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetSchedInfo.h updated: 1.23 -> 1.24

---
Log message:

Fixed friend class name for ModuloSched


---
Diffs of the changes:  (+3 -3)

Index: llvm/include/llvm/Target/TargetSchedInfo.h
diff -u llvm/include/llvm/Target/TargetSchedInfo.h:1.23 llvm/include/llvm/Target/TargetSchedInfo.h:1.24
--- llvm/include/llvm/Target/TargetSchedInfo.h:1.23	Fri Apr 30 15:40:38 2004
+++ llvm/include/llvm/Target/TargetSchedInfo.h	Fri Apr 30 15:46:40 2004
@@ -67,8 +67,8 @@
   resourceId_t rid;
   int maxNumUsers;   // MAXINT if no restriction
   
-  CPUResource(const std::string& resourceName, int maxUsers)
-    : rname(resourceName), rid(nextId++), maxNumUsers(maxUsers) {}
+  CPUResource(const std::string& resourceName, int maxUsers);
+
 private:
   static resourceId_t nextId;
 };
@@ -303,7 +303,7 @@
 
 
 
-  friend class ModuloSchedulingPass;
+  friend class ModuloScheduling;
   
 };
 




From tbrethou at cs.uiuc.edu  Fri Apr 30 15:49:01 2004
From: tbrethou at cs.uiuc.edu (Tanya Brethour)
Date: Fri Apr 30 15:49:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetSchedInfo.h
Message-ID: <200404302048.PAA05895@seraph.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetSchedInfo.h updated: 1.25 -> 1.26

---
Log message:

Sorry, now friend class name should be right!!


---
Diffs of the changes:  (+1 -1)

Index: llvm/include/llvm/Target/TargetSchedInfo.h
diff -u llvm/include/llvm/Target/TargetSchedInfo.h:1.25 llvm/include/llvm/Target/TargetSchedInfo.h:1.26
--- llvm/include/llvm/Target/TargetSchedInfo.h:1.25	Fri Apr 30 15:47:59 2004
+++ llvm/include/llvm/Target/TargetSchedInfo.h	Fri Apr 30 15:48:37 2004
@@ -303,7 +303,7 @@
 
 
   friend class ModuloSchedGraph;
-  friend class ModuloSchedulingPass;
+  friend class ModuloScheduling;
   
 };
 




From tbrethou at cs.uiuc.edu  Fri Apr 30 15:49:04 2004
From: tbrethou at cs.uiuc.edu (Tanya Brethour)
Date: Fri Apr 30 15:49:04 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Target/TargetSchedInfo.h
Message-ID: <200404302048.PAA05882@seraph.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Target:

TargetSchedInfo.h updated: 1.24 -> 1.25

---
Log message:

Fixed friend class name for ModuloScheduling.


---
Diffs of the changes:  (+2 -2)

Index: llvm/include/llvm/Target/TargetSchedInfo.h
diff -u llvm/include/llvm/Target/TargetSchedInfo.h:1.24 llvm/include/llvm/Target/TargetSchedInfo.h:1.25
--- llvm/include/llvm/Target/TargetSchedInfo.h:1.24	Fri Apr 30 15:46:40 2004
+++ llvm/include/llvm/Target/TargetSchedInfo.h	Fri Apr 30 15:47:59 2004
@@ -302,8 +302,8 @@
 			   conflictLists;   // indexed by [opcode]
 
 
-
-  friend class ModuloScheduling;
+  friend class ModuloSchedGraph;
+  friend class ModuloSchedulingPass;
   
 };
 




From lattner at cs.uiuc.edu  Fri Apr 30 17:17:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Apr 30 17:17:02 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200404302217.RAA19351@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.168 -> 1.169

---
Log message:

Fix broken link, again.


---
Diffs of the changes:  (+2 -2)

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.168 llvm/docs/ReleaseNotes.html:1.169
--- llvm/docs/ReleaseNotes.html:1.168	Fri Apr 30 09:13:16 2004
+++ llvm/docs/ReleaseNotes.html	Fri Apr 30 17:17:12 2004
@@ -12,7 +12,7 @@
 <ol>
   <li><a href="#intro">Introduction</a></li>
   <li><a href="#whatsnew">What's New?</a></li>
-  <li><a href="GettingStartedGuide.html">Installation Instructions</a></li>
+  <li><a href="GettingStarted.html">Installation Instructions</a></li>
   <li><a href="#portability">Portability and Supported Platforms</a></li>
   <li><a href="#knownproblems">Known Problems</a>
   <ul>
@@ -611,7 +611,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/04/30 14:13:16 $
+  Last modified: $Date: 2004/04/30 22:17:12 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Fri Apr 30 17:18:14 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Fri Apr 30 17:18:14 2004
Subject: [llvm-commits] CVS: llvm-www/releases/1.2/docs/ReleaseNotes.html
Message-ID: <200404302217.RAA19910@zion.cs.uiuc.edu>


Changes in directory llvm-www/releases/1.2/docs:

ReleaseNotes.html updated: 1.10 -> 1.11

---
Log message:

Fix broken link, again.


---
Diffs of the changes:  (+2 -2)

Index: llvm-www/releases/1.2/docs/ReleaseNotes.html
diff -u llvm-www/releases/1.2/docs/ReleaseNotes.html:1.10 llvm-www/releases/1.2/docs/ReleaseNotes.html:1.11
--- llvm-www/releases/1.2/docs/ReleaseNotes.html:1.10	Fri Apr 30 09:14:06 2004
+++ llvm-www/releases/1.2/docs/ReleaseNotes.html	Fri Apr 30 17:17:37 2004
@@ -15,7 +15,7 @@
   <li><a href="#intro">Introduction</a></li>
   <li><a href="#whatsnew">What's New?</a></li>
   <li><a href="#portability">Portability and Supported Platforms</a></li>
-  <li><a href="GettingStartedGuide.html">Installation Instructions</a></li>
+  <li><a href="GettingStarted.html">Installation Instructions</a></li>
   <li><a href="#knownproblems">Known Problems</a>
   <ul>
     <li><a href="#experimental">Experimental features included with this release</a>
@@ -675,7 +675,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/04/30 14:14:06 $
+  Last modified: $Date: 2004/04/30 22:17:37 $
 </address>
 
 </body>




From gaeke at cs.uiuc.edu  Sat May  1 01:43:03 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat May  1 01:43:03 2004
Subject: [llvm-commits] CVS: llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
Message-ID: <200405010642.BAA17831@seraph.cs.uiuc.edu>


Changes in directory llvm/lib/ExecutionEngine/Interpreter:

ExternalFunctions.cpp updated: 1.72 -> 1.73

---
Log message:

Generalize the strlen size_t hack, for the benefit of the other external
functions with wrappers that either take or return size_ts.


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

Index: llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
diff -u llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.72 llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.73
--- llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp:1.72	Sun Dec 28 03:44:37 2003
+++ llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp	Sat May  1 01:42:15 2004
@@ -481,20 +481,35 @@
   return PTOGV(strcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1])));
 }
 
-// size_t strlen(const char *src);
-GenericValue lle_X_strlen(FunctionType *M, const vector<GenericValue> &Args) {
-  assert(Args.size() == 1);
-  size_t strlenResult = strlen ((char *) GVTOP (Args[0]));
+static GenericValue size_t_to_GV (size_t n) {
   GenericValue Ret;
   if (sizeof (size_t) == sizeof (uint64_t)) {
-    Ret.ULongVal = strlenResult;
+    Ret.ULongVal = n;
   } else {
     assert (sizeof (size_t) == sizeof (unsigned int));
-    Ret.UIntVal = strlenResult;
+    Ret.UIntVal = n;
   }
   return Ret;
 }
 
+static size_t GV_to_size_t (GenericValue GV) { 
+  size_t count;
+  if (sizeof (size_t) == sizeof (uint64_t)) {
+    count = GV.ULongVal;
+  } else {
+    assert (sizeof (size_t) == sizeof (unsigned int));
+    count = GV.UIntVal;
+  }
+  return count;
+}
+
+// size_t strlen(const char *src);
+GenericValue lle_X_strlen(FunctionType *M, const vector<GenericValue> &Args) {
+  assert(Args.size() == 1);
+  size_t strlenResult = strlen ((char *) GVTOP (Args[0]));
+  return size_t_to_GV (strlenResult);
+}
+
 // char *strdup(const char *src);
 GenericValue lle_X_strdup(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 1);
@@ -510,14 +525,15 @@
 // void *memset(void *S, int C, size_t N)
 GenericValue lle_X_memset(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 3);
-  return PTOGV(memset(GVTOP(Args[0]), Args[1].IntVal, Args[2].UIntVal));
+  size_t count = GV_to_size_t (Args[2]);
+  return PTOGV(memset(GVTOP(Args[0]), Args[1].IntVal, count));
 }
 
 // void *memcpy(void *Dest, void *src, size_t Size);
 GenericValue lle_X_memcpy(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 3);
-  return PTOGV(memcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]),
-                      Args[2].UIntVal));
+  size_t count = GV_to_size_t (Args[2]);
+  return PTOGV(memcpy((char*)GVTOP(Args[0]), (char*)GVTOP(Args[1]), count));
 }
 
 //===----------------------------------------------------------------------===//
@@ -594,21 +610,21 @@
 // size_t fread(void *ptr, size_t size, size_t nitems, FILE *stream);
 GenericValue lle_X_fread(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 4);
-  GenericValue GV;
+  size_t result;
 
-  GV.UIntVal = fread((void*)GVTOP(Args[0]), Args[1].UIntVal,
-                     Args[2].UIntVal, getFILE(GVTOP(Args[3])));
-  return GV;
+  result = fread((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]),
+                 GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3])));
+  return size_t_to_GV (result);
 }
 
 // size_t fwrite(const void *ptr, size_t size, size_t nitems, FILE *stream);
 GenericValue lle_X_fwrite(FunctionType *M, const vector<GenericValue> &Args) {
   assert(Args.size() == 4);
-  GenericValue GV;
+  size_t result;
 
-  GV.UIntVal = fwrite((void*)GVTOP(Args[0]), Args[1].UIntVal,
-                      Args[2].UIntVal, getFILE(GVTOP(Args[3])));
-  return GV;
+  result = fwrite((void*)GVTOP(Args[0]), GV_to_size_t (Args[1]),
+                  GV_to_size_t (Args[2]), getFILE(GVTOP(Args[3])));
+  return size_t_to_GV (result);
 }
 
 // char *fgets(char *s, int n, FILE *stream);




From lattner at cs.uiuc.edu  Sat May  1 06:17:06 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 06:17:06 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/TargetSchedInfo.cpp
Message-ID: <200405011117.GAA31664@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target:

TargetSchedInfo.cpp updated: 1.15 -> 1.16

---
Log message:

Add a constructor that got lost


---
Diffs of the changes:  (+3 -0)

Index: llvm/lib/Target/TargetSchedInfo.cpp
diff -u llvm/lib/Target/TargetSchedInfo.cpp:1.15 llvm/lib/Target/TargetSchedInfo.cpp:1.16
--- llvm/lib/Target/TargetSchedInfo.cpp:1.15	Fri Apr 30 15:39:59 2004
+++ llvm/lib/Target/TargetSchedInfo.cpp	Sat May  1 06:17:13 2004
@@ -19,6 +19,9 @@
 
 resourceId_t CPUResource::nextId = 0;
 
+CPUResource::CPUResource(const std::string& resourceName, int maxUsers)
+  : rname(resourceName), rid(nextId++), maxNumUsers(maxUsers) {}
+
 // Check if fromRVec and toRVec have *any* common entries.
 // Assume the vectors are sorted in increasing order.
 // Algorithm copied from function set_intersection() for sorted ranges




From lattner at cs.uiuc.edu  Sat May  1 06:40:00 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 06:40:00 2004
Subject: [llvm-commits] CVS: llvm/docs/GettingStarted.html
Message-ID: <200405011140.GAA32333@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

GettingStarted.html updated: 1.53 -> 1.54

---
Log message:

Add comment about optimizations


---
Diffs of the changes:  (+4 -2)

Index: llvm/docs/GettingStarted.html
diff -u llvm/docs/GettingStarted.html:1.53 llvm/docs/GettingStarted.html:1.54
--- llvm/docs/GettingStarted.html:1.53	Mon Mar 29 14:18:09 2004
+++ llvm/docs/GettingStarted.html	Sat May  1 06:40:07 2004
@@ -1132,7 +1132,9 @@
       <tt>hello.bc</tt>. The <tt>hello.bc</tt> is the LLVM bytecode that
       corresponds the the compiled program and the library facilities that it
       required.  <tt>hello</tt> is a simple shell script that runs the bytecode
-      file with <tt>lli</tt>, making the result directly executable.</p></li>
+      file with <tt>lli</tt>, making the result directly executable.  Note that
+      all LLVM optimizations are enabled by default, so there is no need for a 
+      "-O3" switch.</p></li>
 
   <li><p>Run the program. To make sure the program ran, execute one of the
       following commands:</p>
@@ -1213,7 +1215,7 @@
 
   <a href="mailto:sabre at nondot.org">Chris Lattner</a><br>
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/03/29 20:18:09 $
+  Last modified: $Date: 2004/05/01 11:40:07 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Sat May  1 07:40:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 07:40:01 2004
Subject: [llvm-commits] CVS: llvm-gcc/gcc/config/i386/t-cygming t-interix
Message-ID: <200405011239.HAA30877@zion.cs.uiuc.edu>


Changes in directory llvm-gcc/gcc/config/i386:

t-cygming updated: 1.1.1.2 -> 1.2
t-interix updated: 1.1.1.1 -> 1.2

---
Log message:

Fix build problem on cygwin


---
Diffs of the changes:  (+6 -4)

Index: llvm-gcc/gcc/config/i386/t-cygming
diff -u llvm-gcc/gcc/config/i386/t-cygming:1.1.1.2 llvm-gcc/gcc/config/i386/t-cygming:1.2
--- llvm-gcc/gcc/config/i386/t-cygming:1.1.1.2	Tue Jan 13 10:49:46 2004
+++ llvm-gcc/gcc/config/i386/t-cygming	Sat May  1 07:39:41 2004
@@ -1,5 +1,6 @@
-LIB1ASMSRC = i386/cygwin.asm
-LIB1ASMFUNCS = _chkstk
+## LLVM does not want platform specific .s files
+#LIB1ASMSRC = i386/cygwin.asm
+#LIB1ASMFUNCS = _chkstk
 
 # cygwin and mingw always have a limits.h, but, depending upon how we are
 # doing the build, it may not be installed yet.


Index: llvm-gcc/gcc/config/i386/t-interix
diff -u llvm-gcc/gcc/config/i386/t-interix:1.1.1.1 llvm-gcc/gcc/config/i386/t-interix:1.2
--- llvm-gcc/gcc/config/i386/t-interix:1.1.1.1	Thu Jan  8 15:58:50 2004
+++ llvm-gcc/gcc/config/i386/t-interix	Sat May  1 07:39:41 2004
@@ -1,5 +1,6 @@
-LIB1ASMSRC = i386/cygwin.asm
-LIB1ASMFUNCS = _chkstk
+## LLVM does not want platform specific .s files
+#LIB1ASMSRC = i386/cygwin.asm
+#LIB1ASMFUNCS = _chkstk
 
 winnt.o: $(srcdir)/config/i386/winnt.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
   $(TM_H) $(RTL_H) $(REGS_H) hard-reg-set.h output.h $(TREE_H) flags.h \




From lattner at cs.uiuc.edu  Sat May  1 16:05:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 16:05:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineBasicBlock.h
Message-ID: <200405012105.QAA15520@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

MachineBasicBlock.h updated: 1.28 -> 1.29

---
Log message:

Move the GraphTraits for MachineBasicBlocks to the MachineBasicBlock file.


---
Diffs of the changes:  (+70 -0)

Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.28 llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.29
--- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.28	Tue Apr 27 23:46:35 2004
+++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Sat May  1 16:05:10 2004
@@ -15,6 +15,7 @@
 #define LLVM_CODEGEN_MACHINEBASICBLOCK_H
 
 #include "llvm/CodeGen/MachineInstr.h"
+#include "Support/GraphTraits.h"
 #include "Support/ilist"
 #include <iosfwd>
 
@@ -194,6 +195,75 @@
     assert (goner != Predecessors.end ()
             && "Trying to removePredecessor a MBB which isn't my predecessor");
     Predecessors.erase (goner);
+  }
+};
+
+
+//===--------------------------------------------------------------------===//
+// GraphTraits specializations for machine basic block graphs (machine-CFGs)
+//===--------------------------------------------------------------------===//
+
+// Provide specializations of GraphTraits to be able to treat a
+// MachineFunction as a graph of MachineBasicBlocks...
+//
+
+template <> struct GraphTraits<MachineBasicBlock *> {
+  typedef MachineBasicBlock NodeType;
+  typedef MachineBasicBlock::succ_iterator ChildIteratorType;
+
+  static NodeType *getEntryNode(MachineBasicBlock *BB) { return BB; }
+  static inline ChildIteratorType child_begin(NodeType *N) { 
+    return N->succ_begin();
+  }
+  static inline ChildIteratorType child_end(NodeType *N) { 
+    return N->succ_end();
+  }
+};
+
+template <> struct GraphTraits<const MachineBasicBlock *> {
+  typedef const MachineBasicBlock NodeType;
+  typedef MachineBasicBlock::const_succ_iterator ChildIteratorType;
+
+  static NodeType *getEntryNode(const MachineBasicBlock *BB) { return BB; }
+  static inline ChildIteratorType child_begin(NodeType *N) { 
+    return N->succ_begin();
+  }
+  static inline ChildIteratorType child_end(NodeType *N) { 
+    return N->succ_end();
+  }
+};
+
+// Provide specializations of GraphTraits to be able to treat a
+// MachineFunction as a graph of MachineBasicBlocks... and to walk it
+// in inverse order.  Inverse order for a function is considered
+// to be when traversing the predecessor edges of a MBB
+// instead of the successor edges.
+//
+template <> struct GraphTraits<Inverse<MachineBasicBlock*> > {
+  typedef MachineBasicBlock NodeType;
+  typedef MachineBasicBlock::pred_iterator ChildIteratorType;
+  static NodeType *getEntryNode(Inverse<MachineBasicBlock *> G) {
+    return G.Graph;
+  }
+  static inline ChildIteratorType child_begin(NodeType *N) { 
+    return N->pred_begin();
+  }
+  static inline ChildIteratorType child_end(NodeType *N) { 
+    return N->pred_end();
+  }
+};
+
+template <> struct GraphTraits<Inverse<const MachineBasicBlock*> > {
+  typedef const MachineBasicBlock NodeType;
+  typedef MachineBasicBlock::const_pred_iterator ChildIteratorType;
+  static NodeType *getEntryNode(Inverse<const MachineBasicBlock*> G) {
+    return G.Graph; 
+  }
+  static inline ChildIteratorType child_begin(NodeType *N) { 
+    return N->pred_begin();
+  }
+  static inline ChildIteratorType child_end(NodeType *N) { 
+    return N->pred_end();
   }
 };
 




From lattner at cs.uiuc.edu  Sat May  1 16:06:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 16:06:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Support/CFG.h
Message-ID: <200405012105.QAA15983@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Support:

CFG.h updated: 1.19 -> 1.20

---
Log message:

Move the GraphTraits for MachineBasicBlocks to the MachineBasicBlock file.


---
Diffs of the changes:  (+0 -124)

Index: llvm/include/llvm/Support/CFG.h
diff -u llvm/include/llvm/Support/CFG.h:1.19 llvm/include/llvm/Support/CFG.h:1.20
--- llvm/include/llvm/Support/CFG.h:1.19	Thu Apr 29 12:43:55 2004
+++ llvm/include/llvm/Support/CFG.h	Sat May  1 16:05:34 2004
@@ -17,7 +17,6 @@
 
 #include "Support/GraphTraits.h"
 #include "llvm/Function.h"
-#include "llvm/CodeGen/MachineFunction.h"
 #include "llvm/InstrTypes.h"
 #include "Support/iterator"
 
@@ -264,129 +263,6 @@
   public GraphTraits<Inverse<const BasicBlock*> > {
   static NodeType *getEntryNode(Inverse<const Function *> G) {
     return &G.Graph->getEntryBlock();
-  }
-};
-
-//===--------------------------------------------------------------------===//
-// GraphTraits specializations for machine basic block graphs (machine-CFGs)
-//===--------------------------------------------------------------------===//
-
-// Provide specializations of GraphTraits to be able to treat a
-// MachineFunction as a graph of MachineBasicBlocks...
-//
-
-template <> struct GraphTraits<MachineBasicBlock *> {
-  typedef MachineBasicBlock NodeType;
-  typedef MachineBasicBlock::succ_iterator ChildIteratorType;
-
-  static NodeType *getEntryNode(MachineBasicBlock *BB) { return BB; }
-  static inline ChildIteratorType child_begin(NodeType *N) { 
-    return N->succ_begin();
-  }
-  static inline ChildIteratorType child_end(NodeType *N) { 
-    return N->succ_end();
-  }
-};
-
-template <> struct GraphTraits<const MachineBasicBlock *> {
-  typedef const MachineBasicBlock NodeType;
-  typedef MachineBasicBlock::const_succ_iterator ChildIteratorType;
-
-  static NodeType *getEntryNode(const MachineBasicBlock *BB) { return BB; }
-  static inline ChildIteratorType child_begin(NodeType *N) { 
-    return N->succ_begin();
-  }
-  static inline ChildIteratorType child_end(NodeType *N) { 
-    return N->succ_end();
-  }
-};
-
-// Provide specializations of GraphTraits to be able to treat a
-// MachineFunction as a graph of MachineBasicBlocks... and to walk it
-// in inverse order.  Inverse order for a function is considered
-// to be when traversing the predecessor edges of a MBB
-// instead of the successor edges.
-//
-template <> struct GraphTraits<Inverse<MachineBasicBlock*> > {
-  typedef MachineBasicBlock NodeType;
-  typedef MachineBasicBlock::pred_iterator ChildIteratorType;
-  static NodeType *getEntryNode(Inverse<MachineBasicBlock *> G) {
-    return G.Graph;
-  }
-  static inline ChildIteratorType child_begin(NodeType *N) { 
-    return N->pred_begin();
-  }
-  static inline ChildIteratorType child_end(NodeType *N) { 
-    return N->pred_end();
-  }
-};
-
-template <> struct GraphTraits<Inverse<const MachineBasicBlock*> > {
-  typedef const MachineBasicBlock NodeType;
-  typedef MachineBasicBlock::const_pred_iterator ChildIteratorType;
-  static NodeType *getEntryNode(Inverse<const MachineBasicBlock*> G) {
-    return G.Graph; 
-  }
-  static inline ChildIteratorType child_begin(NodeType *N) { 
-    return N->pred_begin();
-  }
-  static inline ChildIteratorType child_end(NodeType *N) { 
-    return N->pred_end();
-  }
-};
-
-
-//===--------------------------------------------------------------------===//
-// GraphTraits specializations for MachineFunction bb graphs (machine-CFGs)
-//===--------------------------------------------------------------------===//
-
-// Provide specializations of GraphTraits to be able to treat a
-// MachineFunction as a graph of MachineBasicBlocks... these are the
-// same as the MachineBasicBlock iterators, except that the root node
-// is implicitly the first node of the MachineFunction.
-//
-template <> struct GraphTraits<MachineFunction*> :
-  public GraphTraits<MachineBasicBlock*> {
-  static NodeType *getEntryNode(MachineFunction *F) {
-    return &F->front();
-  }
-  // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
-  typedef MachineFunction::iterator nodes_iterator;
-  static nodes_iterator nodes_begin(MachineFunction *F) { return F->begin(); }
-  static nodes_iterator nodes_end  (MachineFunction *F) { return F->end(); }
-};
-template <> struct GraphTraits<const MachineFunction*> :
-  public GraphTraits<const MachineBasicBlock*> {
-  static NodeType *getEntryNode(const MachineFunction *F) {
-    return &F->front();
-  }
-  // nodes_iterator/begin/end - Allow iteration over all nodes in the graph
-  typedef MachineFunction::const_iterator nodes_iterator;
-  static nodes_iterator nodes_begin(const MachineFunction *F) {
-    return F->begin();
-  }
-  static nodes_iterator nodes_end  (const MachineFunction *F) {
-    return F->end();
-  }
-};
-
-
-// Provide specializations of GraphTraits to be able to treat a
-// MachineFunction as a graph of MachineBasicBlocks... and to walk it
-// in inverse order.  Inverse order for a MachineFunction is considered
-// to be when traversing the predecessor edges of a MBB instead of the
-// successor edges.
-//
-template <> struct GraphTraits<Inverse<MachineFunction*> > :
-  public GraphTraits<Inverse<MachineBasicBlock*> > {
-  static NodeType *getEntryNode(Inverse<MachineFunction*> G) {
-    return &G.Graph->front();
-  }
-};
-template <> struct GraphTraits<Inverse<const MachineFunction*> > :
-  public GraphTraits<Inverse<const MachineBasicBlock*> > {
-  static NodeType *getEntryNode(Inverse<const MachineFunction *> G) {
-    return &G.Graph->front();
   }
 };
 




From lattner at cs.uiuc.edu  Sat May  1 16:24:03 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 16:24:03 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/LiveVariables.h
Message-ID: <200405012123.QAA24238@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

LiveVariables.h updated: 1.13 -> 1.14

---
Log message:

Stop LiveVariables from using BasicBlocks as part of the mapping, instead
use MachineBasicBlocks.


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

Index: llvm/include/llvm/CodeGen/LiveVariables.h
diff -u llvm/include/llvm/CodeGen/LiveVariables.h:1.13 llvm/include/llvm/CodeGen/LiveVariables.h:1.14
--- llvm/include/llvm/CodeGen/LiveVariables.h:1.13	Thu Feb 19 12:28:22 2004
+++ llvm/include/llvm/CodeGen/LiveVariables.h	Sat May  1 16:23:35 2004
@@ -100,10 +100,9 @@
 
 private:   // Intermediate data structures
 
-  /// BBMap - Maps LLVM basic blocks to their corresponding machine basic block.
-  /// This also provides a numbering of the basic blocks in the function.
-  std::map<const BasicBlock*, std::pair<MachineBasicBlock*, unsigned> > BBMap;
-
+  /// BBMap - This provides a numbering of the basic blocks in the function.
+  ///
+  std::map<MachineBasicBlock*, unsigned> BBMap;
 
   /// BBIdxMap - This contains the inverse mapping of BBMap, going from block ID
   /// numbers to the corresponding MachineBasicBlock.  This is lazily computed
@@ -125,11 +124,8 @@
   /// getMachineBasicBlockIndex - Turn a MachineBasicBlock into an index number
   /// suitable for use with VarInfo's.
   ///
-  const std::pair<MachineBasicBlock*, unsigned>
-      &getMachineBasicBlockInfo(MachineBasicBlock *MBB) const;
-  const std::pair<MachineBasicBlock*, unsigned>
-      &getBasicBlockInfo(const BasicBlock *BB) const {
-    return BBMap.find(BB)->second;
+  unsigned getMachineBasicBlockIndex(MachineBasicBlock *MBB) const {
+    return BBMap.find(MBB)->second;
   }
 
   /// getIndexMachineBasicBlock() - Given a block index, return the
@@ -269,7 +265,7 @@
     return AllocatablePhysicalRegisters;
   }
 
-  void MarkVirtRegAliveInBlock(VarInfo &VRInfo, const BasicBlock *BB);
+  void MarkVirtRegAliveInBlock(VarInfo &VRInfo, MachineBasicBlock *BB);
   void HandleVirtRegUse(VarInfo &VRInfo, MachineBasicBlock *MBB,
                        	MachineInstr *MI);
 };




From lattner at cs.uiuc.edu  Sat May  1 16:25:03 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 16:25:03 2004
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveIntervals.cpp PHIElimination.cpp
Message-ID: <200405012124.QAA24262@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

LiveIntervals.cpp updated: 1.70 -> 1.71
PHIElimination.cpp updated: 1.21 -> 1.22

---
Log message:

Operate on the Machine CFG instead of on the LLVM CFG


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

Index: llvm/lib/CodeGen/LiveIntervals.cpp
diff -u llvm/lib/CodeGen/LiveIntervals.cpp:1.70 llvm/lib/CodeGen/LiveIntervals.cpp:1.71
--- llvm/lib/CodeGen/LiveIntervals.cpp:1.70	Mon Apr 12 15:26:39 2004
+++ llvm/lib/CodeGen/LiveIntervals.cpp	Sat May  1 16:24:39 2004
@@ -17,6 +17,7 @@
 
 #define DEBUG_TYPE "liveintervals"
 #include "LiveIntervals.h"
+#include "llvm/Value.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/CodeGen/MachineFrameInfo.h"
@@ -26,7 +27,6 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Support/CFG.h"
 #include "Support/CommandLine.h"
 #include "Support/Debug.h"
 #include "Support/Statistic.h"
@@ -97,10 +97,9 @@
     unsigned miIndex = 0;
     for (MachineFunction::iterator mbb = mf_->begin(), mbbEnd = mf_->end();
          mbb != mbbEnd; ++mbb) {
-        const std::pair<MachineBasicBlock*, unsigned>& entry =
-            lv_->getMachineBasicBlockInfo(mbb);
-        bool inserted = mbbi2mbbMap_.insert(std::make_pair(entry.second,
-                                                           entry.first)).second;
+        unsigned mbbIdx = lv_->getMachineBasicBlockIndex(mbb);
+        bool inserted = mbbi2mbbMap_.insert(std::make_pair(mbbIdx,
+                                                           mbb)).second;
         assert(inserted && "multiple index -> MachineBasicBlock");
 
         for (MachineBasicBlock::iterator mi = mbb->begin(), miEnd = mbb->end();
@@ -182,7 +181,7 @@
     DEBUG(
         for (MachineFunction::iterator mbbi = mf_->begin(), mbbe = mf_->end();
              mbbi != mbbe; ++mbbi) {
-            std::cerr << mbbi->getBasicBlock()->getName() << ":\n";
+            std::cerr << ((Value*)mbbi->getBasicBlock())->getName() << ":\n";
             for (MachineBasicBlock::iterator mii = mbbi->begin(),
                      mie = mbbi->end(); mii != mie; ++mii) {
                 std::cerr << getInstructionIndex(mii) << '\t';
@@ -404,13 +403,13 @@
 {
     DEBUG(std::cerr << "********** COMPUTING LIVE INTERVALS **********\n");
     DEBUG(std::cerr << "********** Function: "
-          << mf_->getFunction()->getName() << '\n');
+          << ((Value*)mf_->getFunction())->getName() << '\n');
 
     for (MbbIndex2MbbMap::iterator
              it = mbbi2mbbMap_.begin(), itEnd = mbbi2mbbMap_.end();
          it != itEnd; ++it) {
         MachineBasicBlock* mbb = it->second;
-        DEBUG(std::cerr << mbb->getBasicBlock()->getName() << ":\n");
+        DEBUG(std::cerr << ((Value*)mbb->getBasicBlock())->getName() << ":\n");
 
         for (MachineBasicBlock::iterator mi = mbb->begin(), miEnd = mbb->end();
              mi != miEnd; ++mi) {
@@ -451,7 +450,7 @@
     for (MachineFunction::iterator mbbi = mf_->begin(), mbbe = mf_->end();
          mbbi != mbbe; ++mbbi) {
         MachineBasicBlock* mbb = mbbi;
-        DEBUG(std::cerr << mbb->getBasicBlock()->getName() << ":\n");
+        DEBUG(std::cerr << ((Value*)mbb->getBasicBlock())->getName() << ":\n");
 
         for (MachineBasicBlock::iterator mi = mbb->begin(), mie = mbb->end();
              mi != mie; ++mi) {


Index: llvm/lib/CodeGen/PHIElimination.cpp
diff -u llvm/lib/CodeGen/PHIElimination.cpp:1.21 llvm/lib/CodeGen/PHIElimination.cpp:1.22
--- llvm/lib/CodeGen/PHIElimination.cpp:1.21	Wed Mar 31 15:59:29 2004
+++ llvm/lib/CodeGen/PHIElimination.cpp	Sat May  1 16:24:39 2004
@@ -20,7 +20,6 @@
 #include "llvm/CodeGen/LiveVariables.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Support/CFG.h"
 #include "Support/STLExtras.h"
 using namespace llvm;
 
@@ -195,14 +194,12 @@
           // at an appropriate point later.
           //
           bool ValueIsLive = false;
-          const BasicBlock *BB = opBlock.getBasicBlock();
-          for (succ_const_iterator SI = succ_begin(BB), E = succ_end(BB);
-               SI != E && !ValueIsLive; ++SI) {
-            const std::pair<MachineBasicBlock*, unsigned> &
-              SuccInfo = LV->getBasicBlockInfo(*SI);
+          for (MachineBasicBlock::succ_iterator SI = opBlock.succ_begin(),
+                 E = opBlock.succ_end(); SI != E && !ValueIsLive; ++SI) {
+            MachineBasicBlock *MBB = *SI;
             
             // Is it alive in this successor?
-            unsigned SuccIdx = SuccInfo.second;
+            unsigned SuccIdx = LV->getMachineBasicBlockIndex(MBB);
             if (SuccIdx < InRegVI.AliveBlocks.size() &&
                 InRegVI.AliveBlocks[SuccIdx]) {
               ValueIsLive = true;
@@ -210,7 +207,6 @@
             }
             
             // Is it killed in this successor?
-            MachineBasicBlock *MBB = SuccInfo.first;
             for (unsigned i = 0, e = InRegVI.Kills.size(); i != e; ++i)
               if (InRegVI.Kills[i].first == MBB) {
                 ValueIsLive = true;




From lattner at cs.uiuc.edu  Sat May  1 16:25:06 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 16:25:06 2004
Subject: [llvm-commits] CVS: llvm/lib/CodeGen/LiveVariables.cpp
Message-ID: <200405012125.QAA24333@zion.cs.uiuc.edu>


Changes in directory llvm/lib/CodeGen:

LiveVariables.cpp updated: 1.29 -> 1.30

---
Log message:

Stop LiveVariables from using BasicBlocks as part of the mapping, instead
use MachineBasicBlocks.  To do this, we traverse the Machine CFG instead of
the LLVM CFG, which is also *MUCH* more efficient by having fewer levels of
indirections and mappings.



---
Diffs of the changes:  (+20 -29)

Index: llvm/lib/CodeGen/LiveVariables.cpp
diff -u llvm/lib/CodeGen/LiveVariables.cpp:1.29 llvm/lib/CodeGen/LiveVariables.cpp:1.30
--- llvm/lib/CodeGen/LiveVariables.cpp:1.29	Tue Mar 30 16:44:39 2004
+++ llvm/lib/CodeGen/LiveVariables.cpp	Sat May  1 16:24:24 2004
@@ -31,28 +31,22 @@
 #include "llvm/Target/MRegisterInfo.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/STLExtras.h"
 using namespace llvm;
 
 static RegisterAnalysis<LiveVariables> X("livevars", "Live Variable Analysis");
 
-const std::pair<MachineBasicBlock*, unsigned> &
-LiveVariables::getMachineBasicBlockInfo(MachineBasicBlock *MBB) const{
-  return BBMap.find(MBB->getBasicBlock())->second;
-}
-  
 /// getIndexMachineBasicBlock() - Given a block index, return the
 /// MachineBasicBlock corresponding to it.
 MachineBasicBlock *LiveVariables::getIndexMachineBasicBlock(unsigned Idx) {
   if (BBIdxMap.empty()) {
     BBIdxMap.resize(BBMap.size());
-    for (std::map<const BasicBlock*, std::pair<MachineBasicBlock*, unsigned> >
-           ::iterator I = BBMap.begin(), E = BBMap.end(); I != E; ++I) {
-      assert(BBIdxMap.size() > I->second.second &&"Indices are not sequential");
-      assert(BBIdxMap[I->second.second] == 0 && "Multiple idx collision!");
-      BBIdxMap[I->second.second] = I->second.first;
+    for (std::map<MachineBasicBlock*, unsigned>::iterator I = BBMap.begin(),
+           E = BBMap.end(); I != E; ++I) {
+      assert(BBIdxMap.size() > I->second && "Indices are not sequential");
+      assert(BBIdxMap[I->second] == 0 && "Multiple idx collision!");
+      BBIdxMap[I->second] = I->first;
     }
   }
   assert(Idx < BBIdxMap.size() && "BB Index out of range!");
@@ -75,10 +69,8 @@
 
 
 void LiveVariables::MarkVirtRegAliveInBlock(VarInfo &VRInfo,
-					    const BasicBlock *BB) {
-  const std::pair<MachineBasicBlock*,unsigned> &Info = BBMap.find(BB)->second;
-  MachineBasicBlock *MBB = Info.first;
-  unsigned BBNum = Info.second;
+					    MachineBasicBlock *MBB) {
+  unsigned BBNum = getMachineBasicBlockIndex(MBB);
 
   // Check to see if this basic block is one of the killing blocks.  If so,
   // remove it...
@@ -99,7 +91,8 @@
   // Mark the variable known alive in this bb
   VRInfo.AliveBlocks[BBNum] = true;
 
-  for (pred_const_iterator PI = pred_begin(BB), E = pred_end(BB); PI != E; ++PI)
+  for (MachineBasicBlock::const_pred_iterator PI = MBB->pred_begin(),
+         E = MBB->pred_end(); PI != E; ++PI)
     MarkVirtRegAliveInBlock(VRInfo, *PI);
 }
 
@@ -125,8 +118,8 @@
 
   // Update all dominating blocks to mark them known live.
   const BasicBlock *BB = MBB->getBasicBlock();
-  for (pred_const_iterator PI = pred_begin(BB), E = pred_end(BB);
-       PI != E; ++PI)
+  for (MachineBasicBlock::const_pred_iterator PI = MBB->pred_begin(),
+         E = MBB->pred_end(); PI != E; ++PI)
     MarkVirtRegAliveInBlock(VRInfo, *PI);
 }
 
@@ -182,7 +175,7 @@
   // Build BBMap... 
   unsigned BBNum = 0;
   for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I)
-    BBMap[I->getBasicBlock()] = std::make_pair(I, BBNum++);
+    BBMap[I] = BBNum++;
 
   // PhysRegInfo - Keep track of which instruction was the last use of a
   // physical register.  This is a purely local property, because all physical
@@ -202,13 +195,11 @@
   // register before its uses due to dominance properties of SSA (except for PHI
   // nodes, which are treated as a special case).
   //
-  const BasicBlock *Entry = MF.getFunction()->begin();
-  for (df_iterator<const BasicBlock*> DFI = df_begin(Entry), E = df_end(Entry);
+  MachineBasicBlock *Entry = MF.begin();
+  for (df_iterator<MachineBasicBlock*> DFI = df_begin(Entry), E = df_end(Entry);
        DFI != E; ++DFI) {
-    const BasicBlock *BB = *DFI;
-    std::pair<MachineBasicBlock*, unsigned> &BBRec = BBMap.find(BB)->second;
-    MachineBasicBlock *MBB = BBRec.first;
-    unsigned BBNum = BBRec.second;
+    MachineBasicBlock *MBB = *DFI;
+    unsigned BBNum = getMachineBasicBlockIndex(MBB);
 
     // Loop over all of the instructions, processing them.
     for (MachineBasicBlock::iterator I = MBB->begin(), E = MBB->end();
@@ -270,9 +261,9 @@
     // bottom of this basic block.  We check all of our successor blocks to see
     // if they have PHI nodes, and if so, we simulate an assignment at the end
     // of the current block.
-    for (succ_const_iterator SI = succ_begin(BB), E = succ_end(BB);
-         SI != E; ++SI) {
-      MachineBasicBlock *Succ = BBMap.find(*SI)->second.first;
+    for (MachineBasicBlock::succ_iterator SI = MBB->succ_begin(),
+           E = MBB->succ_end(); SI != E; ++SI) {
+      MachineBasicBlock *Succ = *SI;
       
       // PHI nodes are guaranteed to be at the top of the block...
       for (MachineBasicBlock::iterator MI = Succ->begin(), ME = Succ->end();
@@ -286,7 +277,7 @@
 	      VarInfo &VRInfo = getVarInfo(MO.getReg());
 
 	      // Only mark it alive only in the block we are representing...
-	      MarkVirtRegAliveInBlock(VRInfo, BB);
+	      MarkVirtRegAliveInBlock(VRInfo, MBB);
 	      break;   // Found the PHI entry for this block...
 	    }
 	  }




From lattner at cs.uiuc.edu  Sat May  1 16:28:03 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 16:28:03 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/FloatingPoint.cpp
Message-ID: <200405012128.QAA25023@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

FloatingPoint.cpp updated: 1.31 -> 1.32

---
Log message:

Iterate over the Machine CFG that Brian added instead of the LLVM CFG.

Look at all of the pretty minuses. :)


---
Diffs of the changes:  (+4 -21)

Index: llvm/lib/Target/X86/FloatingPoint.cpp
diff -u llvm/lib/Target/X86/FloatingPoint.cpp:1.31 llvm/lib/Target/X86/FloatingPoint.cpp:1.32
--- llvm/lib/Target/X86/FloatingPoint.cpp:1.31	Tue Apr 13 21:42:32 2004
+++ llvm/lib/Target/X86/FloatingPoint.cpp	Sat May  1 16:27:53 2004
@@ -37,8 +37,6 @@
 #include "llvm/CodeGen/Passes.h"
 #include "llvm/Target/TargetInstrInfo.h"
 #include "llvm/Target/TargetMachine.h"
-#include "llvm/Function.h"     // FIXME: remove when using MBB CFG!
-#include "llvm/Support/CFG.h"  // FIXME: remove when using MBB CFG!
 #include "Support/Debug.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/Statistic.h"
@@ -161,31 +159,16 @@
   LV = &getAnalysis<LiveVariables>();
   StackTop = 0;
 
-  // Figure out the mapping of MBB's to BB's.
-  //
-  // FIXME: Eventually we should be able to traverse the MBB CFG directly, and
-  // we will need to extend this when one llvm basic block can codegen to
-  // multiple MBBs.
-  //
-  // FIXME again: Just use the mapping established by LiveVariables!
-  //
-  std::map<const BasicBlock*, MachineBasicBlock *> MBBMap;
-  for (MachineFunction::iterator I = MF.begin(), E = MF.end(); I != E; ++I)
-    MBBMap[I->getBasicBlock()] = I;
-
   // Process the function in depth first order so that we process at least one
   // of the predecessors for every reachable block in the function.
-  std::set<const BasicBlock*> Processed;
-  const BasicBlock *Entry = MF.getFunction()->begin();
+  std::set<MachineBasicBlock*> Processed;
+  MachineBasicBlock *Entry = MF.begin();
 
   bool Changed = false;
-  for (df_ext_iterator<const BasicBlock*, std::set<const BasicBlock*> >
+  for (df_ext_iterator<MachineBasicBlock*, std::set<MachineBasicBlock*> >
          I = df_ext_begin(Entry, Processed), E = df_ext_end(Entry, Processed);
        I != E; ++I)
-    Changed |= processBasicBlock(MF, *MBBMap[*I]);
-
-  assert(MBBMap.size() == Processed.size() &&
-         "Doesn't handle unreachable code yet!");
+    Changed |= processBasicBlock(MF, **I);
 
   return Changed;
 }




From lattner at cs.uiuc.edu  Sat May  1 16:29:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 16:29:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Target/X86/InstSelectSimple.cpp
Message-ID: <200405012129.QAA25505@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Target/X86:

InstSelectSimple.cpp updated: 1.241 -> 1.242

---
Log message:

Remove unused #include


---
Diffs of the changes:  (+0 -1)

Index: llvm/lib/Target/X86/InstSelectSimple.cpp
diff -u llvm/lib/Target/X86/InstSelectSimple.cpp:1.241 llvm/lib/Target/X86/InstSelectSimple.cpp:1.242
--- llvm/lib/Target/X86/InstSelectSimple.cpp:1.241	Tue Apr 27 23:45:55 2004
+++ llvm/lib/Target/X86/InstSelectSimple.cpp	Sat May  1 16:29:16 2004
@@ -28,7 +28,6 @@
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Support/GetElementPtrTypeIterator.h"
 #include "llvm/Support/InstVisitor.h"
-#include "llvm/Support/CFG.h"
 #include "Support/Statistic.h"
 using namespace llvm;
 




From lattner at cs.uiuc.edu  Sat May  1 17:36:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 17:36:01 2004
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll
Message-ID: <200405012236.RAA26176@zion.cs.uiuc.edu>


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

branch-cond-prop.ll added (r1.1)

---
Log message:

New testcase for case that simplifycfg should catch


---
Diffs of the changes:  (+20 -0)

Index: llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll
diff -c /dev/null llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll:1.1
*** /dev/null	Sat May  1 17:36:34 2004
--- llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-prop.ll	Sat May  1 17:36:24 2004
***************
*** 0 ****
--- 1,20 ----
+ ; RUN: llvm-as < %s | opt -simplifycfg | llvm-dis | not grep call
+ 
+ declare void %bar()
+ 
+ void %test(int %X, int %Y) {
+ entry:
+         %tmp.2 = setlt int %X, %Y               ; <bool> [#uses=2]
+         br bool %tmp.2, label %shortcirc_next, label %UnifiedReturnBlock
+ 
+ shortcirc_next:         ; preds = %entry
+         br bool %tmp.2, label %UnifiedReturnBlock, label %then
+ 
+ then:           ; preds = %shortcirc_next
+         call void %bar( )
+         ret void
+ 
+ UnifiedReturnBlock:             ; preds = %entry, %shortcirc_next
+ 	ret void
+ }
+ 




From lattner at cs.uiuc.edu  Sat May  1 17:37:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 17:37:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
Message-ID: <200405012236.RAA26315@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.35 -> 1.36

---
Log message:

Implement SimplifyCFG/branch-cond-prop.ll


---
Diffs of the changes:  (+30 -2)

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.35 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.36
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.35	Fri Apr  9 17:50:22 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sat May  1 17:36:37 2004
@@ -797,7 +797,35 @@
           (&*I == cast<Instruction>(BI->getCondition()) &&
            &*++I == BI))
         if (FoldValueComparisonIntoPredecessors(BI))
-          return SimplifyCFG(BB) || 1;
+          return SimplifyCFG(BB) | true;
+    }
+
+    if (BI->isConditional()) {
+      // If this block ends with a branch instruction, and if there is one
+      // predecessor, see if the previous block ended with a branch on the same
+      // condition, which makes this conditional branch redundant.
+      pred_iterator PI(pred_begin(BB)), PE(pred_end(BB));
+      BasicBlock *OnlyPred = *PI++;
+      for (; PI != PE; ++PI)// Search all predecessors, see if they are all same
+        if (*PI != OnlyPred) {
+          OnlyPred = 0;       // There are multiple different predecessors...
+          break;
+        }
+      
+      if (OnlyPred)
+        if (BranchInst *PBI = dyn_cast<BranchInst>(OnlyPred->getTerminator()))
+          if (PBI->isConditional() &&
+              PBI->getCondition() == BI->getCondition() &&
+              PBI->getSuccessor(0) != BB || PBI->getSuccessor(1) != BB) {
+            // Okay, the outcome of this conditional branch is statically
+            // knowable.  Delete the outgoing CFG edge that is impossible to
+            // execute.
+            bool CondIsTrue = PBI->getSuccessor(0) == BB;
+            BI->getSuccessor(CondIsTrue)->removePredecessor(BB);
+            new BranchInst(BI->getSuccessor(!CondIsTrue), BB);
+            BB->getInstList().erase(BI);
+            return SimplifyCFG(BB) | true;
+          }
     }
   }
 
@@ -812,7 +840,7 @@
       OnlyPred = 0;       // There are multiple different predecessors...
       break;
     }
-  
+
   BasicBlock *OnlySucc = 0;
   if (OnlyPred && OnlyPred != BB &&    // Don't break self loops
       OnlyPred->getTerminator()->getOpcode() != Instruction::Invoke) {




From lattner at cs.uiuc.edu  Sat May  1 17:42:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 17:42:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
Message-ID: <200405012242.RAA28000@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.36 -> 1.37

---
Log message:

Fix my missing parens



---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.36 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.37
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.36	Sat May  1 17:36:37 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sat May  1 17:41:51 2004
@@ -816,7 +816,7 @@
         if (BranchInst *PBI = dyn_cast<BranchInst>(OnlyPred->getTerminator()))
           if (PBI->isConditional() &&
               PBI->getCondition() == BI->getCondition() &&
-              PBI->getSuccessor(0) != BB || PBI->getSuccessor(1) != BB) {
+              (PBI->getSuccessor(0) != BB || PBI->getSuccessor(1) != BB)) {
             // Okay, the outcome of this conditional branch is statically
             // knowable.  Delete the outgoing CFG edge that is impossible to
             // execute.




From lattner at cs.uiuc.edu  Sat May  1 18:20:05 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 18:20:05 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200405012320.SAA30524@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.195 -> 1.196

---
Log message:

Make sure the instruction combiner doesn't lose track of instructions
when replacing them, missing the opportunity to do simplifications


---
Diffs of the changes:  (+6 -3)

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.195 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.196
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.195	Thu Apr 29 23:37:52 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sat May  1 18:19:52 2004
@@ -2934,9 +2934,8 @@
   bool Changed = false;
   TD = &getAnalysis<TargetData>();
 
-  for (inst_iterator i = inst_begin(F), e = inst_end(F); i != e; ++i) {
-      WorkList.push_back(&*i);
-  }
+  for (inst_iterator i = inst_begin(F), e = inst_end(F); i != e; ++i)
+    WorkList.push_back(&*i);
 
 
   while (!WorkList.empty()) {
@@ -2997,6 +2996,10 @@
         // Insert the new instruction into the basic block...
         BasicBlock *InstParent = I->getParent();
         InstParent->getInstList().insert(I, Result);
+
+        for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
+          if (Instruction *OpI = dyn_cast<Instruction>(I->getOperand(i)))
+            WorkList.push_back(OpI);
 
         // Everything uses the new instruction now...
         I->replaceAllUsesWith(Result);




From lattner at cs.uiuc.edu  Sat May  1 18:27:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 18:27:01 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
Message-ID: <200405012327.SAA31153@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Scalar:

InstructionCombining.cpp updated: 1.196 -> 1.197

---
Log message:

Make sure to reprocess instructions used by deleted instructions to avoid
missing opportunities for combination.


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

Index: llvm/lib/Transforms/Scalar/InstructionCombining.cpp
diff -u llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.196 llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.197
--- llvm/lib/Transforms/Scalar/InstructionCombining.cpp:1.196	Sat May  1 18:19:52 2004
+++ llvm/lib/Transforms/Scalar/InstructionCombining.cpp	Sat May  1 18:27:23 2004
@@ -2997,6 +2997,8 @@
         BasicBlock *InstParent = I->getParent();
         InstParent->getInstList().insert(I, Result);
 
+        // Make sure that we reprocess all operands now that we reduced their
+        // use counts.
         for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
           if (Instruction *OpI = dyn_cast<Instruction>(I->getOperand(i)))
             WorkList.push_back(OpI);
@@ -3009,14 +3011,19 @@
       } else {
         DEBUG(std::cerr << "IC: MOD = " << *I);
 
-        BasicBlock::iterator II = I;
-
         // If the instruction was modified, it's possible that it is now dead.
         // if so, remove it.
-        if (dceInstruction(II)) {
-          // Instructions may end up in the worklist more than once.  Erase them
-          // all.
+        if (isInstructionTriviallyDead(I)) {
+          // Make sure we process all operands now that we are reducing their
+          // use counts.
+          for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i)
+            if (Instruction *OpI = dyn_cast<Instruction>(I->getOperand(i)))
+              WorkList.push_back(OpI);
+          
+          // Instructions may end up in the worklist more than once.  Erase all
+          // occurrances of this instruction.
           removeFromWorkList(I);
+          I->getParent()->getInstList().erase(I);
           Result = 0;
         }
       }




From lattner at cs.uiuc.edu  Sat May  1 18:35:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 18:35:01 2004
Subject: [llvm-commits] CVS: llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll
Message-ID: <200405012335.SAA31553@zion.cs.uiuc.edu>


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

branch-cond-merge.ll added (r1.1)

---
Log message:

New testcase: 
  Turn "if (A < B && B < C)" into "if (A < B & B < C)"



---
Diffs of the changes:  (+21 -0)

Index: llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll
diff -c /dev/null llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll:1.1
*** /dev/null	Sat May  1 18:35:31 2004
--- llvm/test/Regression/Transforms/SimplifyCFG/branch-cond-merge.ll	Sat May  1 18:35:21 2004
***************
*** 0 ****
--- 1,21 ----
+ ; RUN: llvm-as < %s | opt -simplifycfg -instcombine -simplifycfg | llvm-dis | not grep call
+ 
+ declare void %bar()
+ 
+ void %test(int %X, int %Y) {
+ entry:
+         %tmp.2 = setne int %X, %Y
+         br bool %tmp.2, label %shortcirc_next, label %UnifiedReturnBlock
+ 
+ shortcirc_next:
+         %tmp.3 = setne int %X, %Y
+         br bool %tmp.3, label %UnifiedReturnBlock, label %then
+ 
+ then:
+         call void %bar( )
+         ret void
+ 
+ UnifiedReturnBlock:             ; preds = %entry, %shortcirc_next
+ 	ret void
+ }
+ 




From lattner at cs.uiuc.edu  Sat May  1 18:36:06 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 18:36:06 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
Message-ID: <200405012335.SAA31589@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.37 -> 1.38

---
Log message:

Implement SimplifyCFG/branch-cond-merge.ll
Turning "if (A < B && B < C)" into "if (A < B & B < C)"



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

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.37 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.38
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.37	Sat May  1 17:41:51 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sat May  1 18:35:43 2004
@@ -790,17 +790,71 @@
       if (FoldValueComparisonIntoPredecessors(SI))
         return SimplifyCFG(BB) || 1;
   } else if (BranchInst *BI = dyn_cast<BranchInst>(BB->getTerminator())) {
-    if (Value *CompVal = isValueEqualityComparison(BB->getTerminator())) {
-      // This block must be empty, except for the setcond inst, if it exists.
-      BasicBlock::iterator I = BB->begin();
-      if (&*I == BI ||
-          (&*I == cast<Instruction>(BI->getCondition()) &&
-           &*++I == BI))
-        if (FoldValueComparisonIntoPredecessors(BI))
-          return SimplifyCFG(BB) | true;
-    }
-
     if (BI->isConditional()) {
+      if (Value *CompVal = isValueEqualityComparison(BI)) {
+        // This block must be empty, except for the setcond inst, if it exists.
+        BasicBlock::iterator I = BB->begin();
+        if (&*I == BI ||
+            (&*I == cast<Instruction>(BI->getCondition()) &&
+             &*++I == BI))
+          if (FoldValueComparisonIntoPredecessors(BI))
+            return SimplifyCFG(BB) | true;
+      }
+
+      // If this basic block is ONLY a setcc and a branch, and if a predecessor
+      // branches to us and one of our successors, fold the setcc into the
+      // predecessor and use logical operations to pick the right destination.
+      if (Instruction *Cond = dyn_cast<Instruction>(BI->getCondition()))
+        if (Cond->getParent() == BB && &BB->front() == Cond &&
+            Cond->getNext() == BI && Cond->hasOneUse()) {
+          BasicBlock *TrueDest  = BI->getSuccessor(0);
+          BasicBlock *FalseDest = BI->getSuccessor(1);
+
+          for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI!=E; ++PI)
+            if (BranchInst *PBI = dyn_cast<BranchInst>((*PI)->getTerminator()))
+              if (PBI->isConditional()) {
+                if (PBI->getSuccessor(0) == FalseDest ||
+                    PBI->getSuccessor(1) == TrueDest) {
+                  // Invert the predecessors condition test (xor it with true),
+                  // which allows us to write this code once.
+                  Value *NewCond =
+                    BinaryOperator::createNot(PBI->getCondition(),
+                                    PBI->getCondition()->getName()+".not", PBI);
+                  PBI->setCondition(NewCond);
+                  BasicBlock *OldTrue = PBI->getSuccessor(0);
+                  BasicBlock *OldFalse = PBI->getSuccessor(1);
+                  PBI->setSuccessor(0, OldFalse);
+                  PBI->setSuccessor(1, OldTrue);
+                }
+
+                if (PBI->getSuccessor(0) == TrueDest ||
+                    PBI->getSuccessor(1) == FalseDest) {
+                  // Clone Cond into the predecessor basic block, and and the
+                  // two conditions together.
+                  Instruction *New = Cond->clone();
+                  New->setName(Cond->getName());
+                  Cond->setName(Cond->getName()+".old");
+                  (*PI)->getInstList().insert(PBI, New);
+                  Instruction::BinaryOps Opcode =
+                    PBI->getSuccessor(0) == TrueDest ?
+                    Instruction::Or : Instruction::And;
+                  Value *NewCond = 
+                    BinaryOperator::create(Opcode, PBI->getCondition(),
+                                           New, "bothcond", PBI);
+                  PBI->setCondition(NewCond);
+                  if (PBI->getSuccessor(0) == BB) {
+                    AddPredecessorToBlock(TrueDest, *PI, BB);
+                    PBI->setSuccessor(0, TrueDest);
+                  }
+                  if (PBI->getSuccessor(1) == BB) {
+                    AddPredecessorToBlock(FalseDest, *PI, BB);
+                    PBI->setSuccessor(1, FalseDest);
+                  }
+                  return SimplifyCFG(BB) | 1;
+                }
+              }
+        }
+
       // If this block ends with a branch instruction, and if there is one
       // predecessor, see if the previous block ended with a branch on the same
       // condition, which makes this conditional branch redundant.




From lattner at cs.uiuc.edu  Sat May  1 20:01:00 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 20:01:00 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
Message-ID: <200405020100.UAA06206@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.38 -> 1.39

---
Log message:

Dont' merge terminators that are needed to select PHI node values.


---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.38 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.39
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.38	Sat May  1 18:35:43 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sat May  1 20:00:44 2004
@@ -812,7 +812,7 @@
 
           for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI!=E; ++PI)
             if (BranchInst *PBI = dyn_cast<BranchInst>((*PI)->getTerminator()))
-              if (PBI->isConditional()) {
+              if (PBI->isConditional() && SafeToMergeTerminators(BI, PBI)) {
                 if (PBI->getSuccessor(0) == FalseDest ||
                     PBI->getSuccessor(1) == TrueDest) {
                   // Invert the predecessors condition test (xor it with true),




From gaeke at cs.uiuc.edu  Sat May  1 20:05:00 2004
From: gaeke at cs.uiuc.edu (Brian Gaeke)
Date: Sat May  1 20:05:00 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/CodeGen/MachineBasicBlock.h
Message-ID: <200405020105.UAA06598@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/CodeGen:

MachineBasicBlock.h updated: 1.29 -> 1.30

---
Log message:

Chris told me to take these assertions out a few days ago, but I forgot to
check this in.


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

Index: llvm/include/llvm/CodeGen/MachineBasicBlock.h
diff -u llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.29 llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.30
--- llvm/include/llvm/CodeGen/MachineBasicBlock.h:1.29	Sat May  1 16:05:10 2004
+++ llvm/include/llvm/CodeGen/MachineBasicBlock.h	Sat May  1 20:04:52 2004
@@ -122,9 +122,6 @@
   /// The Predecessors list of succ is automatically updated.
   ///
   void addSuccessor (MachineBasicBlock *succ) {
-    assert (std::find (Successors.begin (), Successors.end (), succ)
-            == Successors.end ()
-            && "Trying to addSuccessor a MBB which is already my successor");
     Successors.push_back (succ);
     succ->addPredecessor (this);
   }
@@ -136,8 +133,6 @@
     succ->removePredecessor (this);
     std::vector<MachineBasicBlock *>::iterator goner =
       std::find (Successors.begin(), Successors.end (), succ);
-    assert (goner != Successors.end ()
-            && "Trying to removeSuccessor a MBB which isn't my successor");
     Successors.erase (goner);
   }
 
@@ -178,9 +173,6 @@
   /// update pred's successors list. Use pred->addSuccessor instead.
   ///
   void addPredecessor (MachineBasicBlock *pred) {
-    assert(std::find (Predecessors.begin (), Predecessors.end (), pred)
-           == Predecessors.end ()
-           && "Trying to addPredecessor a MBB which is already my predecessor");
     Predecessors.push_back (pred);
   }
 
@@ -192,8 +184,6 @@
   void removePredecessor (MachineBasicBlock *pred) {
     std::vector<MachineBasicBlock *>::iterator goner =
       std::find (Predecessors.begin(), Predecessors.end (), pred);
-    assert (goner != Predecessors.end ()
-            && "Trying to removePredecessor a MBB which isn't my predecessor");
     Predecessors.erase (goner);
   }
 };




From lattner at cs.uiuc.edu  Sat May  1 23:19:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sat May  1 23:19:01 2004
Subject: [llvm-commits] CVS: llvm/docs/ReleaseNotes.html
Message-ID: <200405020419.XAA12678@zion.cs.uiuc.edu>


Changes in directory llvm/docs:

ReleaseNotes.html updated: 1.169 -> 1.170

---
Log message:

Add some stuff to the release notes.


---
Diffs of the changes:  (+18 -7)

Index: llvm/docs/ReleaseNotes.html
diff -u llvm/docs/ReleaseNotes.html:1.169 llvm/docs/ReleaseNotes.html:1.170
--- llvm/docs/ReleaseNotes.html:1.169	Fri Apr 30 17:17:12 2004
+++ llvm/docs/ReleaseNotes.html	Sat May  1 23:19:15 2004
@@ -88,10 +88,16 @@
 
 <ol>
 <li>The LLVM <a href="LangRef.html#i_select"><tt>select</tt></a> instruction is
-now fully implemented and supported by all targets, including
-<a href="http://llvm.cs.uiuc.edu/PR322">interpreter support.</a></li>
+now fully implemented and supported by all transformations, native code
+generators, and the interpreter.</li>
 <li>Bugpoint can now narrow down code-generation bugs to a loop nest, where
 before it could only narrow them down to a function being miscompiled.</li>
+<li>The Control Flow Graph in the native code generators is no longer
+constrained to be the same as the CFG for the LLVM input code.</li>
+<li>The LLVM induction variable analysis routines have been rewritten.</li>
+<li>LLVM now has new loop unrolling and loop unswitching passes.</li>
+<li>The induction variable substitution pass performs linear function test
+replacement and exit value replacement optimizations.</li>
 </ol>
 
 
@@ -132,13 +138,13 @@
 
 <!--=========================================================================-->
 <div class="doc_subsubsection">
-<a name="codequality">In this release, the following Code Quality issues were
-fixed:</a>
+<a name="codequality">This release includes the following Code Quality
+improvements:</a>
 </div>
 
 <ol>
-<li><a href="http://llvm.cs.uiuc.edu/PR309">[vmcore] Code quality problem due to
-long operand of getelementptr</a></li>
+<li>Fixed: <a href="http://llvm.cs.uiuc.edu/PR309">[vmcore] Code quality problem
+due to long operand of getelementptr</a></li>
 
 <li>The X86 backend now generates substantially better code for 64-bit integer
 and floating point operations.</li>
@@ -163,6 +169,11 @@
 <li>The link-time optimizer now runs the -prune-eh pass (to remove unused
 exception handlers.</li>
 
+<li>The -simplifycfg pass can now eliminate simple correlated branches (such as
+"<tt>if (A &lt; B &amp;&amp; A &lt; B)</tt>", and can turn short-circuiting
+operators into the strict versions when useful (such as "<tt>if (A &lt; B || A
+&gt; C)</tt>" into "<tt>if (A &lt; B | A &gt; C)</tt>"</li>
+
 </ol>
 
 
@@ -611,7 +622,7 @@
   src="http://www.w3.org/Icons/valid-html401" alt="Valid HTML 4.01!" /></a>
 
   <a href="http://llvm.cs.uiuc.edu">The LLVM Compiler Infrastructure</a><br>
-  Last modified: $Date: 2004/04/30 22:17:12 $
+  Last modified: $Date: 2004/05/02 04:19:15 $
 </address>
 
 </body>




From lattner at cs.uiuc.edu  Sun May  2 00:02:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun May  2 00:02:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
Message-ID: <200405020502.AAA23708@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.39 -> 1.40

---
Log message:

Do not infinitely "unroll" single BB loops.


---
Diffs of the changes:  (+4 -5)

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.39 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.40
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.39	Sat May  1 20:00:44 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sun May  2 00:02:03 2004
@@ -804,12 +804,12 @@
       // If this basic block is ONLY a setcc and a branch, and if a predecessor
       // branches to us and one of our successors, fold the setcc into the
       // predecessor and use logical operations to pick the right destination.
+      BasicBlock *TrueDest  = BI->getSuccessor(0);
+      BasicBlock *FalseDest = BI->getSuccessor(1);
       if (Instruction *Cond = dyn_cast<Instruction>(BI->getCondition()))
         if (Cond->getParent() == BB && &BB->front() == Cond &&
-            Cond->getNext() == BI && Cond->hasOneUse()) {
-          BasicBlock *TrueDest  = BI->getSuccessor(0);
-          BasicBlock *FalseDest = BI->getSuccessor(1);
-
+            Cond->getNext() == BI && Cond->hasOneUse() &&
+            TrueDest != BB && FalseDest != BB)
           for (pred_iterator PI = pred_begin(BB), E = pred_end(BB); PI!=E; ++PI)
             if (BranchInst *PBI = dyn_cast<BranchInst>((*PI)->getTerminator()))
               if (PBI->isConditional() && SafeToMergeTerminators(BI, PBI)) {
@@ -853,7 +853,6 @@
                   return SimplifyCFG(BB) | 1;
                 }
               }
-        }
 
       // If this block ends with a branch instruction, and if there is one
       // predecessor, see if the previous block ended with a branch on the same




From lattner at cs.uiuc.edu  Sun May  2 00:20:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun May  2 00:20:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
Message-ID: <200405020519.AAA26636@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Transforms/Utils:

SimplifyCFG.cpp updated: 1.40 -> 1.41

---
Log message:

Do not clone arbitrary condition instructions.


---
Diffs of the changes:  (+1 -1)

Index: llvm/lib/Transforms/Utils/SimplifyCFG.cpp
diff -u llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.40 llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.41
--- llvm/lib/Transforms/Utils/SimplifyCFG.cpp:1.40	Sun May  2 00:02:03 2004
+++ llvm/lib/Transforms/Utils/SimplifyCFG.cpp	Sun May  2 00:19:36 2004
@@ -806,7 +806,7 @@
       // predecessor and use logical operations to pick the right destination.
       BasicBlock *TrueDest  = BI->getSuccessor(0);
       BasicBlock *FalseDest = BI->getSuccessor(1);
-      if (Instruction *Cond = dyn_cast<Instruction>(BI->getCondition()))
+      if (BinaryOperator *Cond = dyn_cast<BinaryOperator>(BI->getCondition()))
         if (Cond->getParent() == BB && &BB->front() == Cond &&
             Cond->getNext() == BI && Cond->hasOneUse() &&
             TrueDest != BB && FalseDest != BB)




From lattner at cs.uiuc.edu  Sun May  2 02:32:07 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun May  2 02:32:07 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraph.cpp
Message-ID: <200405020731.CAA16909@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

CallGraph.cpp updated: 1.35 -> 1.36

---
Log message:

Plug a minor memory leak


---
Diffs of the changes:  (+1 -0)

Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.35 llvm/lib/Analysis/IPA/CallGraph.cpp:1.36
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.35	Mon Apr 12 00:36:32 2004
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Sun May  2 02:31:34 2004
@@ -125,6 +125,7 @@
        I != E; ++I)
     delete I->second;
   FunctionMap.clear();
+  delete CallsExternalNode;
 }
 
 static void WriteToOutput(const CallGraphNode *CGN, std::ostream &o) {




From lattner at cs.uiuc.edu  Sun May  2 11:06:02 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun May  2 11:06:02 2004
Subject: [llvm-commits] CVS: llvm/lib/Analysis/IPA/CallGraph.cpp
Message-ID: <200405021606.LAA08693@zion.cs.uiuc.edu>


Changes in directory llvm/lib/Analysis/IPA:

CallGraph.cpp updated: 1.36 -> 1.37

---
Log message:

Fix a problem with double freeing memory.  For some reason, CallGraph is not
acting like a normal pass.  :(


---
Diffs of the changes:  (+1 -0)

Index: llvm/lib/Analysis/IPA/CallGraph.cpp
diff -u llvm/lib/Analysis/IPA/CallGraph.cpp:1.36 llvm/lib/Analysis/IPA/CallGraph.cpp:1.37
--- llvm/lib/Analysis/IPA/CallGraph.cpp:1.36	Sun May  2 02:31:34 2004
+++ llvm/lib/Analysis/IPA/CallGraph.cpp	Sun May  2 11:06:18 2004
@@ -126,6 +126,7 @@
     delete I->second;
   FunctionMap.clear();
   delete CallsExternalNode;
+  CallsExternalNode = 0;
 }
 
 static void WriteToOutput(const CallGraphNode *CGN, std::ostream &o) {




From lattner at cs.uiuc.edu  Sun May  2 11:07:01 2004
From: lattner at cs.uiuc.edu (Chris Lattner)
Date: Sun May  2 11:07:01 2004
Subject: [llvm-commits] CVS: llvm/include/llvm/Analysis/CallGraph.h
Message-ID: <200405021606.LAA08839@zion.cs.uiuc.edu>


Changes in directory llvm/include/llvm/Analysis:

CallGraph.h updated: 1.36 -> 1.37

---
Log message:

Initialize member out of paranoia


---
Diffs of the changes:  (+1 -2)

Index: llvm/include/llvm/Analysis/CallGraph.h
diff -u llvm/include/llvm/Analysis/CallGraph.h:1.36 llvm/include/llvm/Analysis/CallGraph.h:1.37
--- llvm/include/llvm/Analysis/CallGraph.h:1.36	Mon Apr 26 11:26:21 2004
+++ llvm/include/llvm/Analysis/CallGraph.h	Sun May  2 11:06:40 2004
@@ -84,7 +84,6 @@
   CallGraphNode *CallsExternalNode;
 
 public:
-
   //===---------------------------------------------------------------------
   // Accessors...
   //
@@ -145,7 +144,7 @@
   //===---------------------------------------------------------------------
   // Pass infrastructure interface glue code...
   //
-  CallGraph() : Root(0) {}
+  CallGraph() : Root(0), CallsExternalNode(0) {}
   ~CallGraph() { destroy(); }
 
   // run - Compute the call graph for the specified module.