[llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp

2007-01-09 Thread Chris Lattner


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.239 -> 1.240
---
Log message:

Inline insertValue into CreateModuleSlot/CreateFunctionSlot


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

 AsmWriter.cpp |   59 +++---
 1 files changed, 24 insertions(+), 35 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.239 llvm/lib/VMCore/AsmWriter.cpp:1.240
--- llvm/lib/VMCore/AsmWriter.cpp:1.239 Tue Jan  9 01:58:11 2007
+++ llvm/lib/VMCore/AsmWriter.cpp   Tue Jan  9 02:04:59 2007
@@ -108,9 +108,6 @@
   /// CreateFunctionSlot - Insert the specified Value* into the slot table.
   void CreateFunctionSlot(const Value *V);
 
-  /// Insert a value into the value table.
-  void insertValue(const Value *V);
-
   /// Add all of the module level global variables (and their initializers)
   /// and function declarations, but not the contents of those functions.
   void processModule();
@@ -1539,7 +1536,20 @@
 
 /// CreateModuleSlot - Insert the specified GlobalValue* into the slot table.
 void SlotMachine::CreateModuleSlot(const GlobalValue *V) {
-  return insertValue(V);
+  assert(V && "Can't insert a null Value into SlotMachine!");
+  
+  unsigned DestSlot = 0;
+  const Type *VTy = V->getType();
+  
+  TypedPlanes::iterator I = mMap.find(VTy);
+  if (I == mMap.end())
+I = mMap.insert(std::make_pair(VTy,ValuePlane())).first;
+  DestSlot = I->second.map[V] = I->second.next_slot++;
+  
+  SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<
+   DestSlot << " [");
+  // G = Global, F = Function, o = other
+  SC_DEBUG((isa(V) ? 'G' : 'F') << "]\n");
 }
 
 
@@ -1547,36 +1557,15 @@
 void SlotMachine::CreateFunctionSlot(const Value *V) {
   const Type *VTy = V->getType();
   assert(VTy != Type::VoidTy && !V->hasName() && "Doesn't need a slot!");
-  return insertValue(V);
-}
-
-
-// Low level insert function. Minimal checking is done. This
-// function is just for the convenience of CreateSlot (above).
-void SlotMachine::insertValue(const Value *V) {
-  assert(V && "Can't insert a null Value into SlotMachine!");
-  assert(!isa(V) || isa(V) &&
- "Can't insert a non-GlobalValue Constant into SlotMachine");
-  assert(V->getType() != Type::VoidTy && !V->hasName());
-
-  const Type *VTy = V->getType();
+  
   unsigned DestSlot = 0;
-
-  if (TheFunction) {
-TypedPlanes::iterator I = fMap.find(VTy);
-if (I == fMap.end())
-  I = fMap.insert(std::make_pair(VTy,ValuePlane())).first;
-DestSlot = I->second.map[V] = I->second.next_slot++;
-  } else {
-TypedPlanes::iterator I = mMap.find(VTy);
-if (I == mMap.end())
-  I = mMap.insert(std::make_pair(VTy,ValuePlane())).first;
-DestSlot = I->second.map[V] = I->second.next_slot++;
-  }
-
-  SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<
-   DestSlot << " [");
+  
+  TypedPlanes::iterator I = fMap.find(VTy);
+  if (I == fMap.end())
+I = fMap.insert(std::make_pair(VTy,ValuePlane())).first;
+  DestSlot = I->second.map[V] = I->second.next_slot++;
+  
   // G = Global, F = Function, o = other
-  SC_DEBUG((isa(V) ? 'G' : (isa(V) ? 'F' : 'o')));
-  SC_DEBUG("]\n");
-}
+  SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<
+   DestSlot << " [o]\n");
+}  



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] Potential Patch for PR1095

2007-01-09 Thread Bill Wendling

Hi all,

I would like someone to review this patch for PR1095. This gives us a  
"dialect" for the assembler code if we're given something like:


__asm__("{cntlz|cntlzw} ...

Before, we were defaulting to the first one. But there are some  
platforms which need the second form.


Here's the patch. Lemme know what you think!

-bw

Index: include/llvm/Target/TargetAsmInfo.h
===
RCS file: /var/cvs/llvm/llvm/include/llvm/Target/TargetAsmInfo.h,v
retrieving revision 1.18
diff -a -u -r1.18 TargetAsmInfo.h
--- include/llvm/Target/TargetAsmInfo.h 21 Dec 2006 21:24:35 -  1.18
+++ include/llvm/Target/TargetAsmInfo.h 9 Jan 2007 08:21:25 -
@@ -27,6 +27,11 @@
   /// properties and features specific to the target.
   class TargetAsmInfo {
   protected:
+enum AsmDialect {
+  ASM_ATT,
+  ASM_INTEL
+};
+
 
//===--===//
 // Properties to be set by the target writer, used to configure asm 
printer.
 //
@@ -128,6 +133,11 @@
 /// Otherwise, it emits ".align log2(N)", e.g. 3 to align to an 8 byte
 /// boundary.
 bool AlignmentIsInBytes;  // Defaults to true
+
+//===--- Assembler Dialect Information 
===//
+
+/// AssemblerDialect - Which dialect of an assembler variant to use.
+AsmDialect AssemblerDialect; // Defaults to ASM_ATT
 
 //===--- Section Switching Directives 
-===//
 
@@ -372,6 +382,9 @@
 bool getAlignmentIsInBytes() const {
   return AlignmentIsInBytes;
 }
+AsmDialect getAssemblerDialect() const {
+  return AssemblerDialect;
+}
 const char *getSwitchToSectionDirective() const {
   return SwitchToSectionDirective;
 }
Index: lib/CodeGen/AsmPrinter.cpp
===
RCS file: /var/cvs/llvm/llvm/lib/CodeGen/AsmPrinter.cpp,v
retrieving revision 1.129
diff -a -u -r1.129 AsmPrinter.cpp
--- lib/CodeGen/AsmPrinter.cpp  31 Dec 2006 05:55:36 -  1.129
+++ lib/CodeGen/AsmPrinter.cpp  9 Jan 2007 08:21:30 -
@@ -701,9 +701,9 @@
   
   O << TAI->getInlineAsmStart() << "\n\t";
 
-  // The variant of the current asmprinter: FIXME: change.
-  int AsmPrinterVariant = 0;
-  
+  // The variant of the current asmprinter.
+  int AsmPrinterVariant = TAI->getAssemblerDialect();
+
   int CurVariant = -1;// The number of the {.|.|.} region we are 
in.
   const char *LastEmitted = AsmStr; // One past the last character emitted.
   
Index: lib/Target/TargetAsmInfo.cpp
===
RCS file: /var/cvs/llvm/llvm/lib/Target/TargetAsmInfo.cpp,v
retrieving revision 1.11
diff -a -u -r1.11 TargetAsmInfo.cpp
--- lib/Target/TargetAsmInfo.cpp1 Dec 2006 20:47:11 -   1.11
+++ lib/Target/TargetAsmInfo.cpp9 Jan 2007 08:21:30 -
@@ -42,6 +42,7 @@
   Data64bitsDirective("\t.quad\t"),
   AlignDirective("\t.align\t"),
   AlignmentIsInBytes(true),
+  AssemblerDialect(ASM_ATT),
   SwitchToSectionDirective("\t.section\t"),
   TextSectionStartSuffix(""),
   DataSectionStartSuffix(""),
Index: lib/Target/PowerPC/PPCTargetAsmInfo.cpp
===
RCS file: /var/cvs/llvm/llvm/lib/Target/PowerPC/PPCTargetAsmInfo.cpp,v
retrieving revision 1.10
diff -a -u -r1.10 PPCTargetAsmInfo.cpp
--- lib/Target/PowerPC/PPCTargetAsmInfo.cpp 21 Dec 2006 20:26:09 -  
1.10
+++ lib/Target/PowerPC/PPCTargetAsmInfo.cpp 9 Jan 2007 08:21:32 -
@@ -23,6 +23,7 @@
   SetDirective = "\t.set";
   Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0;  
   AlignmentIsInBytes = false;
+  AssemblerDialect = ASM_INTEL;
   LCOMMDirective = "\t.lcomm\t";
   InlineAsmStart = "# InlineAsm Start";
   InlineAsmEnd = "# InlineAsm End";
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-www/demo/index.cgi

2007-01-09 Thread John Criswell


Changes in directory llvm-www/demo:

index.cgi updated: 1.66 -> 1.67
---
Log message:

Updated to use my copy of the new LLVM tools and Andrew's newly built CFE.


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

 index.cgi |   10 +-
 1 files changed, 5 insertions(+), 5 deletions(-)


Index: llvm-www/demo/index.cgi
diff -u llvm-www/demo/index.cgi:1.66 llvm-www/demo/index.cgi:1.67
--- llvm-www/demo/index.cgi:1.66Fri Sep 15 01:31:45 2006
+++ llvm-www/demo/index.cgi Tue Jan  9 10:33:12 2007
@@ -5,7 +5,7 @@
 # doing remote web JO99C compilations.  (It could still be used for that
 # purpose, though the two scripts have diverged somewhat.)
 #
-# Last modified $Date: 2006/09/15 06:31:45 $
+# Last modified $Date: 2007/01/09 16:33:12 $
 #
 
 use strict;
@@ -29,9 +29,9 @@
 
 my @PREPENDPATHDIRS =
   (  
-'/home/vadve/criswell/box/x86/llvm-gcc/bin/',
-'/home/vadve/gaeke/llvm/Release/bin', '/home/vadve/gaeke/bin',
-'/home/vadve/gaeke/llvm/projects/Stacker/Release/bin' );
+'/home/vadve/alenhar2/cfe/install/bin/',
+'/home/vadve/criswell/box/x86/latestllvm/Debug/bin',
+'/home/vadve/criswell/box/x86/projects/Stacker/Debug/bin');
 
 sub getname {
 my ($extension) = @_;
@@ -377,7 +377,7 @@
   $stats = "-Wa,--stats,--time-passes,--info-output-file=$timerFile"
if ( $c->param('showstats') );
   try_run( "llvm C/C++ front-end (llvm-gcc)",
-   "llvm-gcc -W -Wall -O2 $stats -o $bytecodeFile -c $inputFile > 
$outputFile 2>&1",
+   "llvm-gcc -emit-llvm -W -Wall -O2 $stats -o $bytecodeFile -c $inputFile 
> $outputFile 2>&1",
 $outputFile );
 }
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm/lib/Target/CBackend/Writer.cpp

2007-01-09 Thread Reid Spencer


Changes in directory llvm/lib/Target/CBackend:

Writer.cpp updated: 1.307 -> 1.308
---
Log message:

For PR1099: http://llvm.org/PR1099 :
Invert the "isSigned" logic in calls to printType and printPrimitiveType.
We want variables to be declared unsigned by default so that signless
operators like + and - perform the unsigned operation that LLVM expects
by default. Parameters with the sext attribute will be declared signed and
signed instructions will case operand values to signed regardless of the
type of the variable. This passes all tests and fixes PR1099: 
http://llvm.org/PR1099 .


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

 Writer.cpp |   66 ++---
 1 files changed, 33 insertions(+), 33 deletions(-)


Index: llvm/lib/Target/CBackend/Writer.cpp
diff -u llvm/lib/Target/CBackend/Writer.cpp:1.307 
llvm/lib/Target/CBackend/Writer.cpp:1.308
--- llvm/lib/Target/CBackend/Writer.cpp:1.307   Tue Jan  9 00:38:06 2007
+++ llvm/lib/Target/CBackend/Writer.cpp Tue Jan  9 11:09:09 2007
@@ -115,7 +115,7 @@
 }
 
 std::ostream &printType(std::ostream &Out, const Type *Ty, 
-bool isSigned = true,
+bool isSigned = false,
 const std::string &VariableName = "",
 bool IgnoreName = false);
 std::ostream &printPrimitiveType(std::ostream &Out, const Type *Ty, 
@@ -348,7 +348,7 @@
 if (PrintedType)
   FunctionInnards << ", ";
 printType(FunctionInnards, *I, 
-/*isSigned=*/!FTy->paramHasAttr(Idx, FunctionType::ZExtAttribute), "");
+/*isSigned=*/FTy->paramHasAttr(Idx, FunctionType::SExtAttribute), "");
 PrintedType = true;
   }
   if (FTy->isVarArg()) {
@@ -360,7 +360,7 @@
   FunctionInnards << ')';
   std::string tstr = FunctionInnards.str();
   printType(Out, RetTy, 
-  /*isSigned=*/!FTy->paramHasAttr(0, FunctionType::SExtAttribute), tstr);
+  /*isSigned=*/FTy->paramHasAttr(0, FunctionType::SExtAttribute), tstr);
 }
 
 std::ostream &
@@ -417,7 +417,7 @@
   if (I != FTy->param_begin())
 FunctionInnards << ", ";
   printType(FunctionInnards, *I, 
- /*isSigned=*/!FTy->paramHasAttr(Idx, FunctionType::ZExtAttribute), 
"");
+ /*isSigned=*/FTy->paramHasAttr(Idx, FunctionType::SExtAttribute), "");
   ++Idx;
 }
 if (FTy->isVarArg()) {
@@ -429,7 +429,7 @@
 FunctionInnards << ')';
 std::string tstr = FunctionInnards.str();
 printType(Out, FTy->getReturnType(), 
-/*isSigned=*/!FTy->paramHasAttr(0, FunctionType::ZExtAttribute), tstr);
+/*isSigned=*/FTy->paramHasAttr(0, FunctionType::SExtAttribute), tstr);
 return Out;
   }
   case Type::StructTyID: {
@@ -439,7 +439,7 @@
 for (StructType::element_iterator I = STy->element_begin(),
E = STy->element_end(); I != E; ++I) {
   Out << "  ";
-  printType(Out, *I, true, "field" + utostr(Idx++));
+  printType(Out, *I, false, "field" + utostr(Idx++));
   Out << ";\n";
 }
 return Out << '}';
@@ -453,14 +453,14 @@
 isa(PTy->getElementType()))
   ptrName = "(" + ptrName + ")";
 
-return printType(Out, PTy->getElementType(), true, ptrName);
+return printType(Out, PTy->getElementType(), false, ptrName);
   }
 
   case Type::ArrayTyID: {
 const ArrayType *ATy = cast(Ty);
 unsigned NumElements = ATy->getNumElements();
 if (NumElements == 0) NumElements = 1;
-return printType(Out, ATy->getElementType(), true,
+return printType(Out, ATy->getElementType(), false,
  NameSoFar + "[" + utostr(NumElements) + "]");
   }
 
@@ -468,7 +468,7 @@
 const PackedType *PTy = cast(Ty);
 unsigned NumElements = PTy->getNumElements();
 if (NumElements == 0) NumElements = 1;
-return printType(Out, PTy->getElementType(), true,
+return printType(Out, PTy->getElementType(), false,
  NameSoFar + "[" + utostr(NumElements) + "]");
   }
 
@@ -834,7 +834,7 @@
   if (ConstantInt *CI = dyn_cast(CPV)) {
 const Type* Ty = CI->getType();
 Out << "((";
-printPrimitiveType(Out, Ty, true) << ')';
+printPrimitiveType(Out, Ty, false) << ')';
 if (CI->isMinValue(true)) 
   Out << CI->getZExtValue() << 'u';
 else
@@ -1019,10 +1019,10 @@
   }
   if (NeedsExplicitCast) {
 Out << "((";
-if (Ty->isPrimitiveType())
+if (Ty->isInteger())
   printPrimitiveType(Out, Ty, TypeIsSigned);
 else
-  printType(Out, Ty);
+  printType(Out, Ty); // not integer, sign doesn't matter
 Out << ")(";
   }
   return NeedsExplicitCast;
@@ -1222,10 +1222,10 @@
   // operand.
   if (shouldCast) {
 Out << "((";
-if (OpTy->isPrimitiveType())
+if (OpTy->isInteger())
   printPrimitiveType(Out, OpTy, castIsSigned);
 else
-  printType(Out, OpTy);
+  printType(Out, OpTy); // not integer, sign doesn't matter
 Out << ")";
 writeOperand(Operand);
 Out << ")";
@@ -145

Re: [llvm-commits] CVS: llvm-www/demo/index.cgi

2007-01-09 Thread Andrew Lenharth
On 1/9/07, John Criswell <[EMAIL PROTECTED]> wrote:
> Updated to use my copy of the new LLVM tools and Andrew's newly built CFE.

The llvm-gcc you want to use is in ~alenhar2/base/cfe-install/bin
the cfe/install one will go away once the packed struct patch is done.

Andrew

>
> ---
> Diffs of the changes:  (+5 -5)
>
>  index.cgi |   10 +-
>  1 files changed, 5 insertions(+), 5 deletions(-)
>
>
> Index: llvm-www/demo/index.cgi
> diff -u llvm-www/demo/index.cgi:1.66 llvm-www/demo/index.cgi:1.67
> --- llvm-www/demo/index.cgi:1.66Fri Sep 15 01:31:45 2006
> +++ llvm-www/demo/index.cgi Tue Jan  9 10:33:12 2007
> @@ -5,7 +5,7 @@
>  # doing remote web JO99C compilations.  (It could still be used for that
>  # purpose, though the two scripts have diverged somewhat.)
>  #
> -# Last modified $Date: 2006/09/15 06:31:45 $
> +# Last modified $Date: 2007/01/09 16:33:12 $
>  #
>
>  use strict;
> @@ -29,9 +29,9 @@
>
>  my @PREPENDPATHDIRS =
>(
> -'/home/vadve/criswell/box/x86/llvm-gcc/bin/',
> -'/home/vadve/gaeke/llvm/Release/bin', '/home/vadve/gaeke/bin',
> -'/home/vadve/gaeke/llvm/projects/Stacker/Release/bin' );
> +'/home/vadve/alenhar2/cfe/install/bin/',
> +'/home/vadve/criswell/box/x86/latestllvm/Debug/bin',
> +'/home/vadve/criswell/box/x86/projects/Stacker/Debug/bin');
>
>  sub getname {
>  my ($extension) = @_;
> @@ -377,7 +377,7 @@
>$stats = "-Wa,--stats,--time-passes,--info-output-file=$timerFile"
> if ( $c->param('showstats') );
>try_run( "llvm C/C++ front-end (llvm-gcc)",
> -   "llvm-gcc -W -Wall -O2 $stats -o $bytecodeFile -c $inputFile > 
> $outputFile 2>&1",
> +   "llvm-gcc -emit-llvm -W -Wall -O2 $stats -o $bytecodeFile -c 
> $inputFile > $outputFile 2>&1",
>  $outputFile );
>  }
>
>
>
>
> ___
> llvm-commits mailing list
> llvm-commits@cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/Makefile

2007-01-09 Thread Evan Cheng


Changes in directory llvm-test/MultiSource/Benchmarks:

Makefile updated: 1.11 -> 1.12
---
Log message:

Added MiBench.

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

 Makefile |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-test/MultiSource/Benchmarks/Makefile
diff -u llvm-test/MultiSource/Benchmarks/Makefile:1.11 
llvm-test/MultiSource/Benchmarks/Makefile:1.12
--- llvm-test/MultiSource/Benchmarks/Makefile:1.11  Tue Feb 14 00:11:36 2006
+++ llvm-test/MultiSource/Benchmarks/Makefile   Tue Jan  9 13:36:13 2007
@@ -4,6 +4,6 @@
 PARALLEL_DIRS := Fhourstones Fhourstones-3.1 \
  McCat Olden OptimizerEval Ptrdist llubenchmark \
  sim FreeBench MallocBench Prolangs-C Prolangs-C++ SciMark2-C\
-mediabench ASCI_Purple
+mediabench ASCI_Purple MiBench
 
 include $(LEVEL)/Makefile.programs



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive/Makefile

2007-01-09 Thread Evan Cheng


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/automotive:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

No qsort.

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

 Makefile |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/automotive/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/automotive/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive/Makefile:1.1.1.1
Mon Jan  8 20:53:45 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/automotive/MakefileTue Jan 
 9 13:54:41 2007
@@ -2,6 +2,6 @@
 
 LEVEL = ../../../..
 
-PARALLEL_DIRS  := basicmath bitcount qsort susan
+PARALLEL_DIRS  := basicmath bitcount susan
 
 include $(LEVEL)/Makefile.programs



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/office/Makefile

2007-01-09 Thread Evan Cheng


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/office:

Makefile added (r1.1)
---
Log message:

Missed a makefile

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

 Makefile |7 +++
 1 files changed, 7 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/office/Makefile
diff -c /dev/null llvm-test/MultiSource/Benchmarks/MiBench/office/Makefile:1.1
*** /dev/null   Tue Jan  9 13:56:07 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/office/MakefileTue Jan  9 
13:55:57 2007
***
*** 0 
--- 1,7 
+ # MultiSource/MiBench/office Makefile:  Build all subdirectories automatically
+ 
+ LEVEL = ../../../..
+ 
+ PARALLEL_DIRS  := ispell stringsearch
+ 
+ include $(LEVEL)/Makefile.programs



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/security/Makefile

2007-01-09 Thread Evan Cheng


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/security:

Makefile added (r1.1)
---
Log message:

Missed a makefile

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

 Makefile |7 +++
 1 files changed, 7 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/security/Makefile
diff -c /dev/null llvm-test/MultiSource/Benchmarks/MiBench/security/Makefile:1.1
*** /dev/null   Tue Jan  9 13:57:39 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/security/Makefile  Tue Jan  9 
13:57:29 2007
***
*** 0 
--- 1,7 
+ # MultiSource/MiBench/security Makefile:  Build all subdirectories 
automatically
+ 
+ LEVEL = ../../../..
+ 
+ PARALLEL_DIRS  := blowfish rijndael sha
+ 
+ include $(LEVEL)/Makefile.programs



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm/docs/LangRef.html

2007-01-09 Thread Reid Spencer


Changes in directory llvm/docs:

LangRef.html updated: 1.190 -> 1.191
---
Log message:

Explain that bitcast can only cast a pointer to another pointer.


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

 LangRef.html |5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)


Index: llvm/docs/LangRef.html
diff -u llvm/docs/LangRef.html:1.190 llvm/docs/LangRef.html:1.191
--- llvm/docs/LangRef.html:1.190Mon Jan  8 01:55:15 2007
+++ llvm/docs/LangRef.html  Tue Jan  9 14:08:58 2007
@@ -3090,7 +3090,8 @@
 The 'bitcast' instruction takes a value to cast, which must be 
 a first class value, and a type to cast it to, which must also be a first class type. The bit sizes of value
-and the destination type, ty2, must be identical.
+and the destination type, ty2, must be identical. If the source
+type is a pointer, the destination type must also be a pointer.
 
 Semantics:
 The 'bitcast' instruction converts value to type
@@ -4475,7 +4476,7 @@
 
   mailto:[EMAIL PROTECTED]">Chris Lattner
   http://llvm.org";>The LLVM Compiler Infrastructure
-  Last modified: $Date: 2007/01/08 07:55:15 $
+  Last modified: $Date: 2007/01/09 20:08:58 $
 
 
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] [release_19] CVS: llvm-poolalloc/include/poolalloc/Config/config.h.in

2007-01-09 Thread John Criswell


Changes in directory llvm-poolalloc/include/poolalloc/Config:

config.h.in updated: 1.3.2.1 -> 1.3.2.2
---
Log message:

Merge in some DSA cleanup from mainline.


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

 config.h.in |2 ++
 1 files changed, 2 insertions(+)


Index: llvm-poolalloc/include/poolalloc/Config/config.h.in
diff -u llvm-poolalloc/include/poolalloc/Config/config.h.in:1.3.2.1 
llvm-poolalloc/include/poolalloc/Config/config.h.in:1.3.2.2
--- llvm-poolalloc/include/poolalloc/Config/config.h.in:1.3.2.1 Wed Dec 13 
15:58:21 2006
+++ llvm-poolalloc/include/poolalloc/Config/config.h.in Tue Jan  9 15:12:35 2007
@@ -410,6 +410,7 @@
 /* Define if dlsym() requires a leading underscore in symbol names. */
 #undef NEED_USCORE
 
+#if 0
 /* Define to the address where bug reports for this package should be sent. */
 #undef PACKAGE_BUGREPORT
 
@@ -424,6 +425,7 @@
 
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
+#endif
 
 /* Define as the return type of signal handlers (`int' or `void'). */
 #undef RETSIGTYPE



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile:1.1.1.1 
Mon Jan  8 20:55:39 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/Makefile Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = lame
+PROG = consumer-lame
 CPPFLAGS = -DHAVEMPGLIB -DLAMEPARSE -DNDEBUG -D__NO_MATH_INLINES -O 
-DLAMESNDFILE
 LDFLAGS  = -lm
 RUN_OPTIONS = -S large.wav output_large.mp3



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish/Makefile:1.1.1.1 
Mon Jan  8 21:00:27 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish/Makefile Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = blowfish
+PROG = security-blowfish
 LDFLAGS  = -lm
 RUN_OPTIONS = e input_large.asc output_large.enc 
1234567890abcdeffedcba0987654321
 #RUN_OPTIONS = d output_large.enc output_large.asc 
1234567890abcdeffedcba0987654321



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile:1.1.1.1  
Mon Jan  8 21:16:26 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile  Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = fft
+PROG = telecomm-fft
 LDFLAGS  = -lm
 RUN_OPTIONS = 8 32768 -i
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile:1.1.1.1
Mon Jan  8 21:06:42 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/MakefileTue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = rawdaudio
+PROG = telecomm-adpcm
 LDFLAGS  = -lm
 RUN_OPTIONS = < large.adpcm
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael/Makefile:1.1.1.1 
Mon Jan  8 21:01:47 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael/Makefile Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = rijndael
+PROG = security-rijndael
 LDFLAGS  = -lm
 #RUN_OPTIONS = input_large.asc output_large.enc e 
1234567890abcdeffedcba09876543211234567890abcdeffedcba0987654321
 RUN_OPTIONS = output_large.enc output_large.dec d 
1234567890abcdeffedcba09876543211234567890abcdeffedcba0987654321



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm/Makefile:1.1.1.1  
Mon Jan  8 21:16:32 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm/Makefile  Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = untoast
+PROG = telecomm-gsm
 CPPFLAGS = -DSTUPID_COMPILER -DNeedFunctionPrototypes=1 -DSASR
 LDFLAGS  = -lm
 RUN_OPTIONS = -fps -c large.au.run.gsm



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile:1.1.1.1  
Mon Jan  8 20:56:05 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/Makefile  Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = lout
+PROG = consumer-typeset
 CPPFLAGS = -DOS_UNIX=1 -DOS_DOS=0 -DOS_MAC=0 -DDB_FIX=0 -DUSE_STAT=1 
-DSAFE_DFT=0 -DCOLLATE=1 -DLIB_DIR=\"lout.lib\" -DFONT_DIR=\"font\" 
-DMAPS_DIR=\"maps\" -DINCL_DIR=\"include\" -DDATA_DIR=\"data\" 
-DHYPH_DIR=\"hyph\" -DLOCALE_DIR=\"locale\" -DCHAR_IN=1 -DCHAR_OUT=0 
-DLOCALE_ON=1 -DASSERT_ON=1 -DDEBUG_ON=0  -DPDF_COMPRESSION=0
 LDFLAGS  = -lm
 RUN_OPTIONS = -I data/include -D data/data -F data/font -C data/maps -H 
data/hyph large.lout > output_large.ps



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan/Makefile:1.1.1.1  
Mon Jan  8 20:53:49 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan/Makefile  Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = susan
+PROG = automotive-susan
 LDFLAGS  = -lm
 RUN_OPTIONS = input_large.pgm output_large.smoothing.pgm -s
 include $(LEVEL)/MultiSource/Makefile.multisrc



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile:1.2
--- 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile:1.1.1.1   
Mon Jan  8 20:53:46 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile   
Tue Jan  9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = bitcount
+PROG = automotive-bitcount
 LDFLAGS  = -lm
 RUN_OPTIONS = 1125000
 include $(LEVEL)/MultiSource/Makefile.multisrc



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile:1.2
--- 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile:1.1.1.1  
Mon Jan  8 20:53:45 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile  
Tue Jan  9 16:44:02 2007
@@ -1,5 +1,5 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = basicmath
+PROG = automotive-basicmath
 LDFLAGS  = -lm
 include $(LEVEL)/MultiSource/Makefile.multisrc



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg/Makefile:1.1.1.1 
Mon Jan  8 20:54:30 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg/Makefile Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = djpeg
+PROG = consumer-jpeg
 LDFLAGS  = -lm
 RUN_OPTIONS = -dct int -ppm -outfile output_large_decode.ppm input_large.jpg
 include $(LEVEL)/MultiSource/Makefile.multisrc



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile:1.1.1.1  
Mon Jan  8 20:57:53 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile  Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = dijkstra
+PROG = network-dijkstra
 LDFLAGS  = -lm
 RUN_OPTIONS = input.dat
 include $(LEVEL)/MultiSource/Makefile.multisrc



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/network-patricia/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/network-patricia:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/network-patricia/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/network-patricia/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/network-patricia/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/network-patricia/Makefile:1.1.1.1  
Mon Jan  8 20:58:26 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/network-patricia/Makefile  Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = patricia
+PROG = network-patricia
 LDFLAGS  = -lm
 RUN_OPTIONS = large.udp
 include $(LEVEL)/MultiSource/Makefile.multisrc



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/office-ispell/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/office-ispell:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/office-ispell/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/office-ispell/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/office-ispell/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/office-ispell/Makefile:1.1.1.1 
Mon Jan  8 20:59:03 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/office-ispell/Makefile Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = ispell
+PROG = office-ispell
 CPPFLAGS = -Dconst=
 LDFLAGS  = -lm
 RUN_OPTIONS = -a -d americanmed+ < large.txt



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/security-sha/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/security-sha:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/security-sha/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/security-sha/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/security-sha/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/security-sha/Makefile:1.1.1.1  
Mon Jan  8 21:04:16 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/security-sha/Makefile  Tue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = sha
+PROG = security-sha
 LDFLAGS  = -lm
 RUN_OPTIONS = input_large.asc 
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch/Makefile:1.2
--- 
llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch/Makefile:1.1.1.1   
Mon Jan  8 20:59:06 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch/Makefile   
Tue Jan  9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = stringsearch
+PROG = office-stringsearch
 LDFLAGS  = -lm
 
 include $(LEVEL)/MultiSource/Makefile.multisrc



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/Makefile
diff -u 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/Makefile:1.1.1.1
Mon Jan  8 21:16:25 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/MakefileTue Jan 
 9 16:44:02 2007
@@ -1,6 +1,6 @@
-LEVEL = ../../../../..
+LEVEL = ../../../..
 
-PROG = CRC32
+PROG = telecomm-CRC32
 LDFLAGS  = -lm
 RUN_OPTIONS = large.pcm
 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench:

Makefile updated: 1.1.1.1 -> 1.2
---
Log message:

flatten directory hierarchy


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

 Makefile |   22 --
 1 files changed, 20 insertions(+), 2 deletions(-)


Index: llvm-test/MultiSource/Benchmarks/MiBench/Makefile
diff -u llvm-test/MultiSource/Benchmarks/MiBench/Makefile:1.1.1.1 
llvm-test/MultiSource/Benchmarks/MiBench/Makefile:1.2
--- llvm-test/MultiSource/Benchmarks/MiBench/Makefile:1.1.1.1   Mon Jan  8 
20:53:45 2007
+++ llvm-test/MultiSource/Benchmarks/MiBench/Makefile   Tue Jan  9 16:44:02 2007
@@ -1,9 +1,27 @@
-# MultiSource/MiBench Makefile:  Build all subdirectories automatically
+# MultiSource/Benchmarks/MiBench Makefile
 
 LEVEL = ../../..
 
 ## NOTE: This must remain in this order, so that the labels in the nightly 
 ## tester gnuplot scripts are correct.
-PARALLEL_DIRS  := automotive consumer network office security telecomm
+PARALLEL_DIRS  := \
+   automotive-basicmath \
+   automotive-bitcount \
+   automotive-susan \
+   consumer-jpeg \
+   consumer-lame \
+   consumer-typeset \
+   network-dijkstra \
+   network-patricia \
+   office-ispell \
+   office-stringsearch \
+   security-blowfish \
+   security-rijndael \
+   security-sha \
+   telecomm-CRC32 \
+   telecomm-FFT \
+   telecomm-adpcm \
+   telecomm-gsm
 
 include $(LEVEL)/Makefile.programs
+



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm/lib/Transforms/IPO/GlobalOpt.cpp

2007-01-09 Thread Chris Lattner


Changes in directory llvm/lib/Transforms/IPO:

GlobalOpt.cpp updated: 1.82 -> 1.83
---
Log message:

Fix a bug in heap-sra that caused compilation failure of office-ispell.



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

 GlobalOpt.cpp |   22 +++---
 1 files changed, 19 insertions(+), 3 deletions(-)


Index: llvm/lib/Transforms/IPO/GlobalOpt.cpp
diff -u llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.82 
llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.83
--- llvm/lib/Transforms/IPO/GlobalOpt.cpp:1.82  Sat Dec 30 23:48:39 2006
+++ llvm/lib/Transforms/IPO/GlobalOpt.cpp   Tue Jan  9 17:29:37 2007
@@ -1016,9 +1016,25 @@
   // loads, and all uses of those loads are simple.  Rewrite them to use loads
   // of the per-field globals instead.
   while (!GV->use_empty()) {
-LoadInst *LI = cast(GV->use_back());
-RewriteUsesOfLoadForHeapSRoA(LI, FieldGlobals);
-LI->eraseFromParent();
+if (LoadInst *LI = dyn_cast(GV->use_back())) {
+  RewriteUsesOfLoadForHeapSRoA(LI, FieldGlobals);
+  LI->eraseFromParent();
+} else {
+  // Must be a store of null.
+  StoreInst *SI = cast(GV->use_back());
+  assert(isa(SI->getOperand(0)) &&
+ cast(SI->getOperand(0))->isNullValue() &&
+ "Unexpected heap-sra user!");
+  
+  // Insert a store of null into each global.
+  for (unsigned i = 0, e = FieldGlobals.size(); i != e; ++i) {
+Constant *Null = 
+  Constant::getNullValue(FieldGlobals[i]->getType()->getElementType());
+new StoreInst(Null, FieldGlobals[i], SI);
+  }
+  // Erase the original store.
+  SI->eraseFromParent();
+}
   }
 
   // The old global is now dead, remove it.



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench added to the 
repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch/

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/office-stringsearch 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/network-patricia/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/network-patricia:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/network-patricia added 
to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/security-blowfish added 
to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/security-sha/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/security-sha:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/security-sha 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset added 
to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-jpeg 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/automotive-susan added 
to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/office-ispell/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/office-ispell:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/office-ispell 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm:

---
Log message:

Directory /var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/telecomm-gsm 
added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra added 
to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael/

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/security-rijndael added 
to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/Makefile

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench:

Makefile added (r1.1)
---
Log message:

re-check-in MiBench


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

 Makefile |   27 +++
 1 files changed, 27 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/Makefile
diff -c /dev/null llvm-test/MultiSource/Benchmarks/MiBench/Makefile:1.1
*** /dev/null   Tue Jan  9 17:38:24 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/Makefile   Tue Jan  9 17:38:14 2007
***
*** 0 
--- 1,27 
+ # MultiSource/Benchmarks/MiBench Makefile
+ 
+ LEVEL = ../../..
+ 
+ ## NOTE: This must remain in this order, so that the labels in the nightly 
+ ## tester gnuplot scripts are correct.
+ PARALLEL_DIRS  := \
+automotive-basicmath \
+automotive-bitcount \
+automotive-susan \
+consumer-jpeg \
+consumer-lame \
+consumer-typeset \
+network-dijkstra \
+network-patricia \
+office-ispell \
+office-stringsearch \
+security-blowfish \
+security-rijndael \
+security-sha \
+telecomm-CRC32 \
+telecomm-FFT \
+telecomm-adpcm \
+telecomm-gsm
+ 
+ include $(LEVEL)/Makefile.programs
+ 



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/LICENSE Makefile bitarray.c bitcnt_1.c bitcnt_2.c bitcnt_3.c bitcnt_4.c bitcnts.c bitfiles.c bitops.h bitstrng.c bstr_i

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount:

LICENSE added (r1.1)
Makefile added (r1.1)
bitarray.c added (r1.1)
bitcnt_1.c added (r1.1)
bitcnt_2.c added (r1.1)
bitcnt_3.c added (r1.1)
bitcnt_4.c added (r1.1)
bitcnts.c added (r1.1)
bitfiles.c added (r1.1)
bitops.h added (r1.1)
bitstrng.c added (r1.1)
bstr_i.c added (r1.1)
conio.h added (r1.1)
extkword.h added (r1.1)
sniptype.h added (r1.1)
---
Log message:

Readd mibench


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

 LICENSE|3 +
 Makefile   |6 ++
 bitarray.c |   34 +++
 bitcnt_1.c |   43 +++
 bitcnt_2.c |   40 +
 bitcnt_3.c |  117 
 bitcnt_4.c |   82 
 bitcnts.c  |   94 +
 bitfiles.c |  137 +
 bitops.h   |  112 +
 bitstrng.c |   62 +++
 bstr_i.c   |   42 ++
 conio.h|   22 +
 extkword.h |  102 +
 sniptype.h |   37 
 15 files changed, 933 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/LICENSE
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/LICENSE:1.1
*** /dev/null   Tue Jan  9 17:44:44 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/LICENSE
Tue Jan  9 17:44:34 2007
***
*** 0 
--- 1,3 
+ From http://www.snippets.org/.
+ 
+ This code is FREE with no restrictions.


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile:1.1
*** /dev/null   Tue Jan  9 17:45:02 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/Makefile   
Tue Jan  9 17:44:34 2007
***
*** 0 
--- 1,6 
+ LEVEL = ../../../..
+ 
+ PROG = automotive-bitcount
+ LDFLAGS  = -lm
+ RUN_OPTIONS = 1125000
+ include $(LEVEL)/MultiSource/Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitarray.c
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitarray.c:1.1
*** /dev/null   Tue Jan  9 17:45:02 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitarray.c 
Tue Jan  9 17:44:34 2007
***
*** 0 
--- 1,34 
+ /* +++Date last modified: 05-Jul-1997 */
+ 
+ /*
+ **  Functions to maintain an arbitrary length array of bits
+ */
+ 
+ #include "bitops.h"
+ 
+ char *alloc_bit_array(size_t bits)
+ {
+   char *set = calloc((bits + CHAR_BIT - 1) / CHAR_BIT, sizeof(char));
+ 
+   return set;
+ }
+ 
+ int getbit(char *set, int number)
+ {
+ set += number / CHAR_BIT;
+ return (*set & (1 << (number % CHAR_BIT))) != 0;/* 0 or 1   */
+ }
+ 
+ void setbit(char *set, int number, int value)
+ {
+ set += number / CHAR_BIT;
+ if (value)
+ *set |= 1 << (number % CHAR_BIT);   /* set bit  */
+ else*set &= ~(1 << (number % CHAR_BIT));/* clear bit*/
+ }
+ 
+ void flipbit(char *set, int number)
+ {
+ set += number / CHAR_BIT;
+ *set ^= 1 << (number % CHAR_BIT);   /* flip bit */
+ }


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitcnt_1.c
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitcnt_1.c:1.1
*** /dev/null   Tue Jan  9 17:45:02 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitcnt_1.c 
Tue Jan  9 17:44:34 2007
***
*** 0 
--- 1,43 
+ /* +++Date last modified: 05-Jul-1997 */
+ 
+ /*
+ **  Bit counter by Ratko Tomic
+ */
+ 
+ #include "bitops.h"
+ 
+ int CDECL bit_count(long x)
+ {
+ int n = 0;
+ /*
+ ** The loop will execute once for each bit of x set, this is in average
+ ** twice as fast as the shift/test method.
+ */
+ if (x) do
+   n++;
+ while (0 != (x = x&(x-1))) ;
+ return(n);
+ }
+ 
+ #ifdef TEST
+ 
+ #include 
+ #include "snip_str.h"   /* For plural_text() macro*/
+ 
+ main(int argc, char *argv[])
+ {
+   long n;
+ 
+   while(--argc)
+   {
+ int i;
+ 
+ n = atol(*++argv);
+ i = bit_count(n);
+ printf("%ld contains %d bit%s set\n",
+   n, i, plural_text(i));
+   }
+   return 0;
+ }
+ 
+ #endif /* TEST */


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitcnt_2.c
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitcnt_2.c:1.1
*** /dev/null   Tue Jan  9 17:45:02 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-bitcount/bitcnt_2.c 
Tue Jan  9 17:44:34 2007
***
*** 0 
--- 1,40 

[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/LICENSE Makefile dijkstra.c input.dat

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra:

LICENSE added (r1.1)
Makefile added (r1.1)
dijkstra.c added (r1.1)
input.dat added (r1.1)
---
Log message:

initial recheckin of mibench


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

 LICENSE|5 +
 Makefile   |6 ++
 dijkstra.c |  174 +
 input.dat  |  100 +++
 4 files changed, 285 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/LICENSE
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/LICENSE:1.1
*** /dev/null   Tue Jan  9 17:57:28 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/LICENSE   Tue Jan 
 9 17:57:18 2007
***
*** 0 
--- 1,5 
+ Matt hacked this together.
+ 
+ It is GPL'ed.
+ 
+ 


Index: llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile:1.1
*** /dev/null   Tue Jan  9 17:57:55 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/Makefile  Tue Jan 
 9 17:57:18 2007
***
*** 0 
--- 1,6 
+ LEVEL = ../../../..
+ 
+ PROG = network-dijkstra
+ LDFLAGS  = -lm
+ RUN_OPTIONS = input.dat
+ include $(LEVEL)/MultiSource/Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/dijkstra.c
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/dijkstra.c:1.1
*** /dev/null   Tue Jan  9 17:57:55 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/network-dijkstra/dijkstra.c
Tue Jan  9 17:57:18 2007
***
*** 0 
--- 1,174 
+ #include 
+ 
+ #define NUM_NODES  100
+ #define NONE   
+ 
+ struct _NODE
+ {
+   int iDist;
+   int iPrev;
+ };
+ typedef struct _NODE NODE;
+ 
+ struct _QITEM
+ {
+   int iNode;
+   int iDist;
+   int iPrev;
+   struct _QITEM *qNext;
+ };
+ typedef struct _QITEM QITEM;
+ 
+ QITEM *qHead = NULL;
+ 
+  
+  
+  
+ int AdjMatrix[NUM_NODES][NUM_NODES];
+ 
+ int g_qCount = 0;
+ NODE rgnNodes[NUM_NODES];
+ int ch;
+ int iPrev, iNode;
+ int i, iCost, iDist;
+ 
+ 
+ void print_path (NODE *rgnNodes, int chNode)
+ {
+   if (rgnNodes[chNode].iPrev != NONE)
+ {
+   print_path(rgnNodes, rgnNodes[chNode].iPrev);
+ }
+   printf (" %d", chNode);
+   fflush(stdout);
+ }
+ 
+ 
+ void enqueue (int iNode, int iDist, int iPrev)
+ {
+   QITEM *qNew = (QITEM *) malloc(sizeof(QITEM));
+   QITEM *qLast = qHead;
+   
+   if (!qNew) 
+ {
+   fprintf(stderr, "Out of memory.\n");
+   exit(1);
+ }
+   qNew->iNode = iNode;
+   qNew->iDist = iDist;
+   qNew->iPrev = iPrev;
+   qNew->qNext = NULL;
+   
+   if (!qLast) 
+ {
+   qHead = qNew;
+ }
+   else
+ {
+   while (qLast->qNext) qLast = qLast->qNext;
+   qLast->qNext = qNew;
+ }
+   g_qCount++;
+   //   ASSERT(g_qCount);
+ }
+ 
+ 
+ void dequeue (int *piNode, int *piDist, int *piPrev)
+ {
+   QITEM *qKill = qHead;
+   
+   if (qHead)
+ {
+   // ASSERT(g_qCount);
+   *piNode = qHead->iNode;
+   *piDist = qHead->iDist;
+   *piPrev = qHead->iPrev;
+   qHead = qHead->qNext;
+   free(qKill);
+   g_qCount--;
+ }
+ }
+ 
+ 
+ int qcount (void)
+ {
+   return(g_qCount);
+ }
+ 
+ int dijkstra(int chStart, int chEnd) 
+ {
+   
+ 
+   
+   for (ch = 0; ch < NUM_NODES; ch++)
+ {
+   rgnNodes[ch].iDist = NONE;
+   rgnNodes[ch].iPrev = NONE;
+ }
+ 
+   if (chStart == chEnd) 
+ {
+   printf("Shortest path is 0 in cost. Just stay where you are.\n");
+ }
+   else
+ {
+   rgnNodes[chStart].iDist = 0;
+   rgnNodes[chStart].iPrev = NONE;
+   
+   enqueue (chStart, 0, NONE);
+   
+  while (qcount() > 0)
+   {
+ dequeue (&iNode, &iDist, &iPrev);
+ for (i = 0; i < NUM_NODES; i++)
+   {
+ if ((iCost = AdjMatrix[iNode][i]) != NONE)
+   {
+ if ((NONE == rgnNodes[i].iDist) || 
+ (rgnNodes[i].iDist > (iCost + iDist)))
+   {
+ rgnNodes[i].iDist = iDist + iCost;
+ rgnNodes[i].iPrev = iNode;
+ enqueue (i, iDist + iCost, iNode);
+   }
+   }
+   }
+   }
+   
+   printf("Shortest path is %d in cost. ", rgnNodes[chEnd].iDist);
+   printf("Path is: ");
+   print_path(rgnNodes, chEnd);
+   printf("\n");
+ }
+ }
+ 
+ int main(int argc, char *argv[]) {
+   int i,j,k;
+   FILE *fp;
+   
+   if (argc<2) {
+ fprintf(stderr, "Usage: dijkstra \n");
+ fprintf(stderr, "Only supports matrix size is #define'd.\n");
+   }
+ 
+   /* open the adjacency matrix file */
+   fp = fopen (argv[1],"r");
+ 
+   /* make a fully connected matrix */
+   for (i=

[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/LICENSE Makefile README.MB adpcm.c adpcm.h large.adpcm rawdaudio.c

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm:

LICENSE added (r1.1)
Makefile added (r1.1)
README.MB added (r1.1)
adpcm.c added (r1.1)
adpcm.h added (r1.1)
large.adpcm added (r1.1)
rawdaudio.c added (r1.1)
---
Log message:

initial recheckin of mibench


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

 LICENSE |   24 +
 Makefile|7 +
 README.MB   |   13 +++
 adpcm.c |  252 
 adpcm.h |   19 
 large.adpcm |0 
 rawdaudio.c |   29 ++
 7 files changed, 344 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/LICENSE
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/LICENSE:1.1
*** /dev/null   Tue Jan  9 17:57:29 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/LICENSE Tue Jan 
 9 17:57:19 2007
***
*** 0 
--- 1,24 
+ /***
+ Copyright 1992 by Stichting Mathematisch Centrum, Amsterdam, The
+ Netherlands.
+ 
+ All Rights Reserved
+ 
+ Permission to use, copy, modify, and distribute this software and its 
+ documentation for any purpose and without fee is hereby granted, 
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in 
+ supporting documentation, and that the names of Stichting Mathematisch
+ Centrum or CWI not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior permission.
+ 
+ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ 
+ **/
+ 


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/Makefile:1.1
*** /dev/null   Tue Jan  9 17:57:54 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/MakefileTue Jan 
 9 17:57:19 2007
***
*** 0 
--- 1,7 
+ LEVEL = ../../../..
+ 
+ PROG = telecomm-adpcm
+ LDFLAGS  = -lm
+ RUN_OPTIONS = < large.adpcm
+ 
+ include $(LEVEL)/MultiSource/Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/README.MB
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/README.MB:1.1
*** /dev/null   Tue Jan  9 17:57:54 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/README.MB   Tue Jan 
 9 17:57:19 2007
***
*** 0 
--- 1,13 
+ ==
+ README -- by authors of MediaBench
+ ==
+ 
+ Compiling:
+   To compile this package, go to subdirectory ./src and
+ invoke "make all." This should work on most systems with
+ gcc. Note that on machines other than Sun Sparcs, the 
+ compiler switch -mv8 should not be used.
+ 
+ Running the programs:
+   There are two scripts in the ./bin subdirectory: one for 
+ adpcm encoding and the other for adpcm decoding.


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/adpcm.c
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/adpcm.c:1.1
*** /dev/null   Tue Jan  9 17:57:54 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-adpcm/adpcm.c Tue Jan 
 9 17:57:19 2007
***
*** 0 
--- 1,252 
+ /***
+ Copyright 1992 by Stichting Mathematisch Centrum, Amsterdam, The
+ Netherlands.
+ 
+ All Rights Reserved
+ 
+ Permission to use, copy, modify, and distribute this software and its 
+ documentation for any purpose and without fee is hereby granted, 
+ provided that the above copyright notice appear in all copies and that
+ both that copyright notice and this permission notice appear in 
+ supporting documentation, and that the names of Stichting Mathematisch
+ Centrum or CWI not be used in advertising or publicity pertaining to
+ distribution of the software without specific, written prior permission.
+ 
+ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
+ THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
+ FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
+ OF OR IN 

[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/LICENSE Makefile crc.h crc_32.c large.pcm sniptype.h

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32:

LICENSE added (r1.1)
Makefile added (r1.1)
crc.h added (r1.1)
crc_32.c added (r1.1)
large.pcm added (r1.1)
sniptype.h added (r1.1)
---
Log message:

readd mibench


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

 LICENSE|3 
 Makefile   |7 ++
 crc.h  |   57 ++
 crc_32.c   |  187 +
 large.pcm  |0 
 sniptype.h |   37 
 6 files changed, 291 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/LICENSE
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/LICENSE:1.1
*** /dev/null   Tue Jan  9 18:01:25 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/LICENSE Tue Jan 
 9 18:01:14 2007
***
*** 0 
--- 1,3 
+ From http://www.snippets.org/.
+ 
+ This code is FREE with no restrictions.


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/Makefile
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/Makefile:1.1
*** /dev/null   Tue Jan  9 18:01:35 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/MakefileTue Jan 
 9 18:01:14 2007
***
*** 0 
--- 1,7 
+ LEVEL = ../../../..
+ 
+ PROG = telecomm-CRC32
+ LDFLAGS  = -lm
+ RUN_OPTIONS = large.pcm
+ 
+ include $(LEVEL)/MultiSource/Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc.h
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc.h:1.1
*** /dev/null   Tue Jan  9 18:01:35 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc.h   Tue Jan 
 9 18:01:14 2007
***
*** 0 
--- 1,57 
+ /* +++Date last modified: 05-Jul-1997 */
+ 
+ /*
+ **  CRC.H - header file for SNIPPETS CRC and checksum functions
+ */
+ 
+ #ifndef CRC__H
+ #define CRC__H
+ 
+ #include/* For size_t */
+ #include "sniptype.h" /* For BYTE, WORD, DWORD  */
+ 
+ /*
+ **  File: ARCCRC16.C
+ */
+ 
+ void init_crc_table(void);
+ WORD crc_calc(WORD crc, char *buf, unsigned nbytes);
+ void do_file(char *fn);
+ 
+ /*
+ **  File: CRC-16.C
+ */
+ 
+ WORD crc16(char *data_p, WORD length);
+ 
+ /*
+ **  File: CRC-16F.C
+ */
+ 
+ WORD updcrc(WORD icrc, BYTE *icp, size_t icnt);
+ 
+ /*
+ **  File: CRC_32.C
+ */
+ 
+ #define UPDC32(octet,crc) (crc_32_tab[((crc)^((BYTE)octet)) & 0xff] ^ ((crc) 
>> 8))
+ 
+ DWORD updateCRC32(unsigned char ch, DWORD crc);
+ Boolean_T crc32file(char *name, DWORD *crc, long *charcnt);
+ DWORD crc32buf(char *buf, size_t len);
+ 
+ /*
+ **  File: CHECKSUM.C
+ */
+ 
+ unsigned checksum(void *buffer, size_t len, unsigned int seed);
+ 
+ /*
+ **  File: CHECKEXE.C
+ */
+ 
+ void checkexe(char *fname);
+ 
+ 
+ 
+ #endif /* CRC__H */


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc_32.c
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc_32.c:1.1
*** /dev/null   Tue Jan  9 18:01:35 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-CRC32/crc_32.cTue Jan 
 9 18:01:14 2007
***
*** 0 
--- 1,187 
+ /* +++Date last modified: 05-Jul-1997 */
+ 
+ /* Crc - 32 BIT ANSI X3.66 CRC checksum files */
+ 
+ #include 
+ #include "crc.h"
+ 
+ #ifdef __TURBOC__
+  #pragma warn -cln
+ #endif
+ 
+ /**\
+ |* Demonstration program to compute the 32-bit CRC used as the frame  *|
+ |* check sequence in ADCCP (ANSI X3.66, also known as FIPS PUB 71 *|
+ |* and FED-STD-1003, the U.S. versions of CCITT's X.25 link-level *|
+ |* protocol).  The 32-bit FCS was added via the Federal Register, *|
+ |* 1 June 1982, p.23798.  I presume but don't know for certain that   *|
+ |* this polynomial is or will be included in CCITT V.41, which*|
+ |* defines the 16-bit CRC (often called CRC-CCITT) polynomial.  FIPS  *|
+ |* PUB 78 says that the 32-bit FCS reduces otherwise undetected   *|
+ |* errors by a factor of 10^-5 over 16-bit FCS.   *|
+ \**/
+ 
+ /* Need an unsigned type capable of holding 32 bits; */
+ 
+ typedef DWORD UNS_32_BITS;
+ 
+ /* Copyright (C) 1986 Gary S. Brown.  You may use this program, or
+code or tables extracted from it, as desired without restriction.*/
+ 
+ /* First, the polynomial itself and its table of feedback terms.  The  */
+ /* polynomial is   */
+ /* X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 */
+ /* Note that we take it "backwards" and put the highest-order term in  */
+ /* the lowest-order bit.  The X^32 term is "implied"; the LSB is the   */
+ /* X^31 term, etc.  The X^0 term (usually shown as "+1") results in*/
+ /* the MSB being 1.*/
+ 
+ /* Note t

[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/LICENSE Makefile README ddc.h ddcmath.h fftmisc.c fourier.h fourierf.c main.c

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT:

LICENSE added (r1.1)
Makefile added (r1.1)
README added (r1.1)
ddc.h added (r1.1)
ddcmath.h added (r1.1)
fftmisc.c added (r1.1)
fourier.h added (r1.1)
fourierf.c added (r1.1)
main.c added (r1.1)
---
Log message:

readd mibench


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

 LICENSE|   42 +
 Makefile   |7 ++
 README |   42 +
 ddc.h  |   57 +++
 ddcmath.h  |   16 ++
 fftmisc.c  |   95 ++
 fourier.h  |   65 ++
 fourierf.c |  150 +
 main.c |   86 ++
 9 files changed, 560 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/LICENSE
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/LICENSE:1.1
*** /dev/null   Tue Jan  9 18:01:25 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/LICENSE   Tue Jan 
 9 18:01:15 2007
***
*** 0 
--- 1,42 
+ 
+  ==
+ |  |
+ |   readme.txt  -  by Don Cross <[EMAIL PROTECTED]>  |
+ |  |
+  ==
+ 
+ The file FFT.ZIP contains C source code for performing Discrete Fast Fourier
+ Transforms (DFFTs) and inverse DFFTs.  This source code is public domain.
+ Use at your own risk.  For more information, point your web browser at:
+ 
+ http://www.intersrv.com/~dcross/fft.html
+ 
+ Also, feel free to send questions/comments about this source code to me
+ by e-mail at the address above.
+ 
+ --
+ 
+  *** SMALL REQUESTS 
+ 
+ If you want to give away copies of this source code, that's fine, so long
+ as you do the following:
+ 
+ - Do not charge any money for this source code, except for possibly a
+   reasonable fee to cover postage, disk duplication, etc.  I wrote this
+   code and I want it to be FREE to EVERYONE!
+ 
+ - Do not remove my name, e-mail address, or URL from any of the files in
+   this collection.
+ 
+ - Please keep this readme.txt file with the source and headers so that others
+   can get in touch with me to ask questions and/or find my web page to read
+   the online tutorial.
+ 
+ - If you make any modifications to the source code, please add comments to
+   it which include your name, e-mail address, web page URL (if any), and
+   explain what you did to the code.
+ 
+ - If you use this source code in an interesting program, please let me know.
+   I promise will never try to get money from you, even if you use this code
+   in a commercial program.  I just want to know what kind of clever and
+   creative things people do with Fourier Transforms.


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile:1.1
*** /dev/null   Tue Jan  9 18:01:37 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/Makefile  Tue Jan 
 9 18:01:15 2007
***
*** 0 
--- 1,7 
+ LEVEL = ../../../..
+ 
+ PROG = telecomm-fft
+ LDFLAGS  = -lm
+ RUN_OPTIONS = 8 32768 -i
+ 
+ include $(LEVEL)/MultiSource/Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/README
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/README:1.1
*** /dev/null   Tue Jan  9 18:01:37 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/telecomm-FFT/READMETue Jan 
 9 18:01:15 2007
***
*** 0 
--- 1,42 
+ 
+  ==
+ |  |
+ |   readme.txt  -  by Don Cross <[EMAIL PROTECTED]>  |
+ |  |
+  ==
+ 
+ The file FFT.ZIP contains C source code for performing Discrete Fast Fourier
+ Transforms (DFFTs) and inverse DFFTs.  This source code is public domain.
+ Use at your own risk.  For more information, point your web browser at:
+ 
+ http://www.intersrv.com/~dcross/fft.html
+ 
+ Also, feel free to send questions/comments about this source code to me
+ by e-mail at the address above.
+ 
+ --
+ 
+  *** SMALL REQUESTS 
+ 
+ If you want to give away copies of this source code, that's fine, so long
+ as you do the following:
+ 
+ - Do not charge any money for this source code, except for possibly a
+   reasonable fee to cover postage, disk dupli

[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/data/

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/data:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/data
 added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/LICENSE Makefile basicmath.c cubic.c isqrt.c pi.h rad2deg.c round.h snipmath.h sniptype.h

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath:

LICENSE added (r1.1)
Makefile added (r1.1)
basicmath.c added (r1.1)
cubic.c added (r1.1)
isqrt.c added (r1.1)
pi.h added (r1.1)
rad2deg.c added (r1.1)
round.h added (r1.1)
snipmath.h added (r1.1)
sniptype.h added (r1.1)
---
Log message:

continue adding mibench


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

 LICENSE |3 +
 Makefile|5 ++
 basicmath.c |  123 
 cubic.c |   64 +++
 isqrt.c |   89 +++
 pi.h|   13 ++
 rad2deg.c   |   39 +++
 round.h |   55 ++
 snipmath.h  |   75 
 sniptype.h  |   37 ++
 10 files changed, 503 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/LICENSE
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/LICENSE:1.1
*** /dev/null   Tue Jan  9 18:08:15 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/LICENSE   
Tue Jan  9 18:08:05 2007
***
*** 0 
--- 1,3 
+ From http://www.snippets.org/.
+ 
+ This code is FREE with no restrictions.


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile:1.1
*** /dev/null   Tue Jan  9 18:08:31 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/Makefile  
Tue Jan  9 18:08:05 2007
***
*** 0 
--- 1,5 
+ LEVEL = ../../../..
+ 
+ PROG = automotive-basicmath
+ LDFLAGS  = -lm
+ include $(LEVEL)/MultiSource/Makefile.multisrc


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/basicmath.c
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/basicmath.c:1.1
*** /dev/null   Tue Jan  9 18:08:31 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/basicmath.c   
Tue Jan  9 18:08:05 2007
***
*** 0 
--- 1,123 
+ #include "snipmath.h"
+ #include 
+ 
+ /* The printf's may be removed to isolate just the math calculations */
+ 
+ int main(void)
+ {
+   double  a1 = 1.0, b1 = -10.5, c1 = 32.0, d1 = -30.0;
+   double  x[3];
+   double X;
+   int solutions;
+   int i;
+   unsigned long l = 0x3fed0169L;
+   struct int_sqrt q;
+   long n = 0;
+ 
+   /* solve soem cubic functions */
+   printf("* CUBIC FUNCTIONS ***\n");
+   /* should get 3 solutions: 2, 6 & 2.5   */
+   SolveCubic(a1, b1, c1, d1, &solutions, x);  
+   printf("Solutions:");
+   for(i=0;i0;b1-=.25) {
+   for(c1=5;c1<15;c1+=0.61) {
+  for(d1=-1;d1>-5;d1-=.451) {
+   SolveCubic(a1, b1, c1, d1, &solutions, x);  
+   printf("Solutions:");
+   for(i=0;i
+ #include 
+ #include "snipmath.h"
+ 
+ void SolveCubic(double  a,
+ double  b,
+ double  c,
+ double  d,
+ int*solutions,
+ double *x)
+ {
+   long doublea1 = b/a, a2 = c/a, a3 = d/a;
+   long doubleQ = (a1*a1 - 3.0*a2)/9.0;
+   long double R = (2.0*a1*a1*a1 - 9.0*a1*a2 + 27.0*a3)/54.0;
+   doubleR2_Q3 = R*R - Q*Q*Q;
+ 
+   doubletheta;
+ 
+   if (R2_Q3 <= 0)
+   {
+ *solutions = 3;
+ theta = acos(R/sqrt(Q*Q*Q));
+ x[0] = -2.0*sqrt(Q)*cos(theta/3.0) - a1/3.0;
+ x[1] = -2.0*sqrt(Q)*cos((theta+2.0*PI)/3.0) - a1/3.0;
+ x[2] = -2.0*sqrt(Q)*cos((theta+4.0*PI)/3.0) - a1/3.0;
+   }
+   else
+   {
+ *solutions = 1;
+ x[0] = pow(sqrt(R2_Q3)+fabs(R), 1/3.0);
+ x[0] += Q/x[0];
+ x[0] *= (R < 0.0) ? 1 : -1;
+ x[0] -= a1/3.0;
+   }
+ }
+ 
+ #ifdef TEST
+ 
+ int main(void)
+ {
+   double  a1 = 1.0, b1 = -10.5, c1 = 32.0, d1 = -30.0;
+   double  a2 = 1.0, b2 = -4.5, c2 = 17.0, d2 = -30.0;
+   double  x[3];
+   int solutions;
+ 
+   SolveCubic(a1, b1, c1, d1, &solutions, x);
+ 
+   /* should get 3 solutions: 2, 6 & 2.5   */
+ 
+   SolveCubic(a2, b2, c2, d2, &solutions, x);
+ 
+   /* should get 1 solution: 2.5   */
+ 
+   return 0;
+ }
+ 
+ #endif /* TEST */


Index: llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/isqrt.c
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/isqrt.c:1.1
*** /dev/null   Tue Jan  9 18:08:31 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/automotive-basicmath/isqrt.c   
Tue Jan  9 18:08:05 2007
***
*** 0 
--- 1,89 
+ /* +++Date last modified: 05-Jul-1997 */
+ 
+ #include 
+ #include "snipmath.h"
+ 
+ #define BITSPERLONG 32
+ 
+ #define TOP2BITS(x) ((x & (3L << (BITSPERLONG-2))) >> (BITSPERLONG-2))
+ 
+ 
+ /* usqrt:
+ ENTRY x:

[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/include/

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/include:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/include
 added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/font/

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/font:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/font
 added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/maps/

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/maps:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/maps
 added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/hyph/

2007-01-09 Thread Chris Lattner


Changes in directory 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/hyph:

---
Log message:

Directory 
/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/hyph
 added to the repository


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore

2007-01-09 Thread Chris Lattner


Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame:

.cvsignore added (r1.1)
---
Log message:

new file


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

 .cvsignore |9 +
 1 files changed, 9 insertions(+)


Index: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore
diff -c /dev/null 
llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore:1.1
*** /dev/null   Tue Jan  9 18:36:01 2007
--- llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore   Tue Jan 
 9 18:35:51 2007
***
*** 0 
--- 1,9 
+ *.d
+ Debug
+ DebugGTK
+ Release
+ ReleaseGTK
+ *.ncb
+ *.plg
+ *.opt
+ *.dll



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


Re: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore

2007-01-09 Thread Jeff Cohen
The repository is broken:

cvs update: failed to create lock directory for 
`/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data' 
(/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/#cvs.lock):
 
Permission denied
cvs update: failed to obtain dir lock in repository 
`/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data'
cvs [update aborted]: read lock failed - giving up


Chris Lattner wrote:
> Changes in directory llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame:
>
> .cvsignore added (r1.1)
> ---
> Log message:
>
> new file
>
>
> ---
> Diffs of the changes:  (+9 -0)
>
>  .cvsignore |9 +
>  1 files changed, 9 insertions(+)
>
>
> Index: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore
> diff -c /dev/null 
> llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore:1.1
> *** /dev/null Tue Jan  9 18:36:01 2007
> --- llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore Tue Jan 
>  9 18:35:51 2007
> ***
> *** 0 
> --- 1,9 
> + *.d
> + Debug
> + DebugGTK
> + Release
> + ReleaseGTK
> + *.ncb
> + *.plg
> + *.opt
> + *.dll
>
>
>
> ___
> llvm-commits mailing list
> llvm-commits@cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
>
>   

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


Re: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore

2007-01-09 Thread Chris Lattner

On Jan 9, 2007, at 6:32 PM, Jeff Cohen wrote:

> The repository is broken:
>
> cvs update: failed to create lock directory for
> `/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer- 
> typeset/data'
> (/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer- 
> typeset/data/#cvs.lock):
> Permission denied
> cvs update: failed to obtain dir lock in repository
> `/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer- 
> typeset/data'
> cvs [update aborted]: read lock failed - giving up

Should be fixed now.  Somehow 'cvs add' didn't set the right  
permissions (?).

-Chris
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm/lib/Target/CBackend/Writer.cpp

2007-01-09 Thread LLVM


Changes in directory llvm/lib/Target/CBackend:

Writer.cpp (r1.308) removed
---
Log message:

Rename Writer.cpp as CBackend.cpp so it doesn't conflict with Writer.cpp
in the bytecode writer library. This helps with debugging.


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

 0 files changed



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm/lib/Target/CBackend/CBackend.cpp

2007-01-09 Thread Reid Spencer


Changes in directory llvm/lib/Target/CBackend:

CBackend.cpp updated: 1.308 -> 1.309
---
Log message:

Change the file header name as this file was renamed.


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

 CBackend.cpp |2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)


Index: llvm/lib/Target/CBackend/CBackend.cpp
diff -u llvm/lib/Target/CBackend/CBackend.cpp:1.308 
llvm/lib/Target/CBackend/CBackend.cpp:1.309
--- llvm/lib/Target/CBackend/CBackend.cpp:1.308 Tue Jan  9 11:09:09 2007
+++ llvm/lib/Target/CBackend/CBackend.cpp   Tue Jan  9 22:17:32 2007
@@ -1,4 +1,4 @@
-//===-- Writer.cpp - Library for converting LLVM code to C 
===//
+//===-- CBackend.cpp - Library for converting LLVM code to C 
--===//
 //
 // The LLVM Compiler Infrastructure
 //



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


Re: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore

2007-01-09 Thread Jeff Cohen
It worked.

Now... I can *finally* run the regression tests on freebsd/amd64 and see 
how well they work with everything built with gcc 4.0!  (just 4 
unexpected failures with gmake check).

Chris Lattner wrote:
>
> On Jan 9, 2007, at 6:32 PM, Jeff Cohen wrote:
>
>> The repository is broken:
>>
>> cvs update: failed to create lock directory for
>> `/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data'
>>  
>>
>> (/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/#cvs.lock):
>>  
>>
>> Permission denied
>> cvs update: failed to obtain dir lock in repository
>> `/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data'
>>  
>>
>> cvs [update aborted]: read lock failed - giving up
>
> Should be fixed now.  Somehow 'cvs add' didn't set the right 
> permissions (?).
>
> -Chris
>
>
>

___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


Re: [llvm-commits] CVS: llvm-test/MultiSource/Benchmarks/MiBench/consumer-lame/.cvsignore

2007-01-09 Thread Jeff Cohen

Jeff Cohen wrote:

It worked.

Now... I can *finally* run the regression tests on freebsd/amd64 and see 
how well they work with everything built with gcc 4.0!  (just 4 
unexpected failures with gmake check).
  

That didn't take long:  it's a disaster.

No obvious single cause of failure.  There appear to be many different 
problems.

Chris Lattner wrote:
  

On Jan 9, 2007, at 6:32 PM, Jeff Cohen wrote:



The repository is broken:

cvs update: failed to create lock directory for
`/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data' 

(/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data/#cvs.lock): 


Permission denied
cvs update: failed to obtain dir lock in repository
`/var/cvs/llvm/llvm-test/MultiSource/Benchmarks/MiBench/consumer-typeset/data' 


cvs [update aborted]: read lock failed - giving up
  
Should be fixed now.  Somehow 'cvs add' didn't set the right 
permissions (?).


-Chris






___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



  
___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp

2007-01-09 Thread Chris Lattner


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.240 -> 1.241
---
Log message:

eliminate some iterator gymnastics.


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

 AsmWriter.cpp |   12 
 1 files changed, 4 insertions(+), 8 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.240 llvm/lib/VMCore/AsmWriter.cpp:1.241
--- llvm/lib/VMCore/AsmWriter.cpp:1.240 Tue Jan  9 02:04:59 2007
+++ llvm/lib/VMCore/AsmWriter.cpp   Wed Jan 10 00:43:26 2007
@@ -1541,10 +1541,8 @@
   unsigned DestSlot = 0;
   const Type *VTy = V->getType();
   
-  TypedPlanes::iterator I = mMap.find(VTy);
-  if (I == mMap.end())
-I = mMap.insert(std::make_pair(VTy,ValuePlane())).first;
-  DestSlot = I->second.map[V] = I->second.next_slot++;
+  ValuePlane &PlaneMap = mMap[VTy];
+  DestSlot = PlaneMap.map[V] = PlaneMap.next_slot++;
   
   SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<
DestSlot << " [");
@@ -1560,10 +1558,8 @@
   
   unsigned DestSlot = 0;
   
-  TypedPlanes::iterator I = fMap.find(VTy);
-  if (I == fMap.end())
-I = fMap.insert(std::make_pair(VTy,ValuePlane())).first;
-  DestSlot = I->second.map[V] = I->second.next_slot++;
+  ValuePlane &PlaneMap = fMap[VTy];
+  DestSlot = PlaneMap.map[V] = PlaneMap.next_slot++;
   
   // G = Global, F = Function, o = other
   SC_DEBUG("  Inserting value [" << VTy << "] = " << V << " slot=" <<



___
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


[llvm-commits] CVS: llvm/lib/VMCore/AsmWriter.cpp

2007-01-09 Thread Chris Lattner


Changes in directory llvm/lib/VMCore:

AsmWriter.cpp updated: 1.241 -> 1.242
---
Log message:

Last refactoring before PR645: http://llvm.org/PR645 : split up getSlot into 
getLocalSlot and getGlobalSlot.
No functionality change.


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

 AsmWriter.cpp |  126 +-
 1 files changed, 63 insertions(+), 63 deletions(-)


Index: llvm/lib/VMCore/AsmWriter.cpp
diff -u llvm/lib/VMCore/AsmWriter.cpp:1.241 llvm/lib/VMCore/AsmWriter.cpp:1.242
--- llvm/lib/VMCore/AsmWriter.cpp:1.241 Wed Jan 10 00:43:26 2007
+++ llvm/lib/VMCore/AsmWriter.cpp   Wed Jan 10 01:01:46 2007
@@ -75,9 +75,9 @@
 /// @{
 public:
   /// Return the slot number of the specified value in it's type
-  /// plane.  Its an error to ask for something not in the SlotMachine.
-  /// Its an error to ask for a Type*
-  int getSlot(const Value *V);
+  /// plane.  If something is not in the SlotMachine, return -1.
+  int getLocalSlot(const Value *V);
+  int getGlobalSlot(const GlobalValue *V);
 
 /// @}
 /// @name Mutators
@@ -597,13 +597,20 @@
 } else {
   int Slot;
   if (Machine) {
-Slot = Machine->getSlot(V);
+if (const GlobalValue *GV = dyn_cast(V))
+  Slot = Machine->getGlobalSlot(GV);
+else
+  Slot = Machine->getLocalSlot(V);
   } else {
 Machine = createSlotMachine(V);
-if (Machine)
-  Slot = Machine->getSlot(V);
-else
+if (Machine) {
+  if (const GlobalValue *GV = dyn_cast(V))
+Slot = Machine->getGlobalSlot(GV);
+  else
+Slot = Machine->getLocalSlot(V);
+} else {
   Slot = -1;
+}
 delete Machine;
   }
   if (Slot != -1)
@@ -1042,7 +1049,7 @@
 Out << "\n" << getLLVMName(BB->getName(), false) << ':';
   } else if (!BB->use_empty()) {  // Don't print block # of no uses...
 Out << "\n; :";
-int Slot = Machine.getSlot(BB);
+int Slot = Machine.getLocalSlot(BB);
 if (Slot != -1)
   Out << Slot;
 else
@@ -1091,7 +1098,7 @@
 printType(V.getType()) << '>';
 
 if (!V.hasName()) {
-  int SlotNum = Machine.getSlot(&V);
+  int SlotNum = Machine.getLocalSlot(&V);
   if (SlotNum == -1)
 Out << ":";
   else
@@ -1405,7 +1412,7 @@
 {
 }
 
-inline void SlotMachine::initialize(void) {
+inline void SlotMachine::initialize() {
   if (TheModule) {
 processModule();
 TheModule = 0; ///< Prevent re-processing next time we're called.
@@ -1463,7 +1470,7 @@
 }
 
 /// Clean up after incorporating a function. This is the only way to get out of
-/// the function incorporation state that affects getSlot/Create*Slot. Function
+/// the function incorporation state that affects get*Slot/Create*Slot. 
Function
 /// incorporation state is indicated by TheFunction != 0.
 void SlotMachine::purgeFunction() {
   SC_DEBUG("begin purgeFunction!\n");
@@ -1473,64 +1480,57 @@
   SC_DEBUG("end purgeFunction!\n");
 }
 
-/// Get the slot number for a value. This function will assert if you
-/// ask for a Value that hasn't previously been inserted with Create*Slot.
-int SlotMachine::getSlot(const Value *V) {
-  assert(V && "Can't get slot for null Value");
-  assert(!isa(V) || isa(V) &&
-"Can't insert a non-GlobalValue Constant into SlotMachine");
+/// getGlobalSlot - Get the slot number of a global value.
+int SlotMachine::getGlobalSlot(const GlobalValue *V) {
+  // Check for uninitialized state and do lazy initialization.
+  initialize();
+  
+  // Find the type plane in the module map
+  TypedPlanes::const_iterator MI = mMap.find(V->getType());
+  if (MI == mMap.end()) return -1;
+  
+  // Lookup the value in the module plane's map.
+  ValueMap::const_iterator MVI = MI->second.map.find(V);
+  return MVI != MI->second.map.end() ? MVI->second : -1;
+}
 
-  // Check for uninitialized state and do lazy initialization
-  this->initialize();
 
-  // Get the type of the value
-  const Type* VTy = V->getType();
+/// getLocalSlot - Get the slot number for a value that is local to a function.
+int SlotMachine::getLocalSlot(const Value *V) {
+  assert(!isa(V) && "Can't get a constant or global slot with 
this!");
 
-  // Find the type plane in the module map
-  TypedPlanes::const_iterator MI = mMap.find(VTy);
+  // Check for uninitialized state and do lazy initialization.
+  initialize();
 
-  if (TheFunction) {
-// Lookup the type in the function map too
-TypedPlanes::const_iterator FI = fMap.find(VTy);
-// If there is a corresponding type plane in the function map
-if (FI != fMap.end()) {
-  // Lookup the Value in the function map
-  ValueMap::const_iterator FVI = FI->second.map.find(V);
-  // If the value doesn't exist in the function map
-  if (FVI == FI->second.map.end()) {
-// Look up the value in the module map.
-if (MI == mMap.end()) return -1;
-ValueMap::const_iterator MVI = MI->second.map.find(V);
-