Apple Inc.

v128:128:128
a0:0:1
extern_weak
externally visible
default
e
p:size:abi:pref
i8:8:8
i16:16:16
i32:32:32
i64:32:64
i64:32:64
f32:32:32
f64:64:64
llvm.pcmarker
-  <result> = add <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = add <ty> <op1>, <op2>   ; yields {ty}:result
 
-  <result> = sub <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = sub <ty> <op1>, <op2>   ; yields {ty}:result
 
  <result> = mul <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = mul <ty> <op1>, <op2>   ; yields {ty}:result
 
 Overview:
 The  'mul' instruction returns the product of its two
@@ -2248,7 +2248,7 @@
 
  <result> = udiv <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = udiv <ty> <op1>, <op2>   ; yields {ty}:result
 
 Overview:
 The 'udiv' instruction returns the quotient of its two
@@ -2276,7 +2276,7 @@
 

 Syntax:
 -  <result> = sdiv <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = sdiv <ty> <op1>, <op2>   ; yields {ty}:result
 
 
 Overview:
@@ -2307,7 +2307,7 @@
 
 Syntax:
 -  <result> = fdiv <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = fdiv <ty> <op1>, <op2>   ; yields {ty}:result
 
 Overview:
 
@@ -2336,7 +2336,7 @@
 
 
 Syntax:
-  <result> = urem <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = urem <ty> <op1>, <op2>   ; yields {ty}:result
 
 Overview:
 The 'urem' instruction returns the remainder from the
@@ -2366,7 +2366,7 @@
 
Syntax:
 
 -  <result> = srem <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = srem <ty> <op1>, <op2>   ; yields {ty}:result
 
 
 Overview:
@@ -2385,8 +2385,8 @@
 Semantics:
 
 This instruction returns the remainder of a division (where the result
-has the same sign as the dividend, var1), not the modulo 
-operator (where the result has the same sign as the divisor, var2) of 
+has the same sign as the dividend, op1), not the modulo 
+operator (where the result has the same sign as the divisor, op2) of 
 a value.  For more information about the difference, see The
 Math Forum. For a table of how this is implemented in various languages,
@@ -2412,7 +2412,7 @@
 

 
 Syntax:
-  <result> = frem <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = frem <ty> <op1>, <op2>   ; yields {ty}:result
 
 Overview:
 The 'frem' instruction returns the remainder from the
@@ -2450,7 +2450,7 @@
 Instruction 
 
 Syntax:
-  <result> = shl <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = shl <ty> <op1>, <op2>   ; yields {ty}:result
 
 
 Overview:
@@ -2462,13 +2462,13 @@
 
 Both arguments to the 'shl' instruction must be the same integer or vector of integer 
-type.  'var2' is treated as an unsigned value.
+type.  'op2' is treated as an unsigned value.
  
 Semantics:
 
-The value produced is var1 * 2^var2 mod 2ⁿ,
-where n is the width of the result.  If var2 is (statically or dynamically) negative or
-equal to or larger than the number of bits in var1, the result is undefined.
+The value produced is op1 * 2^op2 mod 2ⁿ,
+where n is the width of the result.  If op2 is (statically or dynamically) negative or
+equal to or larger than the number of bits in op1, the result is undefined.
 
 Example:
   <result> = shl i32 4, %var   ; yields {i32}: 4 << %var
@@ -2482,7 +2482,7 @@
 Instruction 
 
 Syntax:
-  <result> = lshr <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = lshr <ty> <op1>, <op2>   ; yields {ty}:result
 
 
 Overview:
@@ -2492,14 +2492,14 @@
 Arguments:
 Both arguments to the 'lshr' instruction must be the same 
 integer or vector of integer 
-type.  'var2' is treated as an unsigned value.
+type.  'op2' is treated as an unsigned value.
 
 Semantics:
 
 This instruction always performs a logical shift right operation. The most
 significant bits of the result will be filled with zero bits after the 
-shift.  If var2 is (statically or dynamically) equal to or larger than
-the number of bits in var1, the result is undefined.
+shift.  If op2 is (statically or dynamically) equal to or larger than
+the number of bits in op1, the result is undefined.
 
 Example:
 @@ -2517,7 +2517,7 @@
 
 
 Syntax:
-  <result> = ashr <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = ashr <ty> <op1>, <op2>   ; yields {ty}:result
 
 
 Overview:
@@ -2527,13 +2527,13 @@
 Arguments:
 Both arguments to the 'ashr' instruction must be the same 
 integer or vector of integer 
-type.  'var2' is treated as an unsigned value.
+type.  'op2' is treated as an unsigned value.
 
 Semantics:
 This instruction always performs an arithmetic shift right operation, 
 The most significant bits of the result will be filled with the sign bit 
-of var1.  If var2 is (statically or dynamically) equal to or
-larger than the number of bits in var1, the result is undefined.
+of op1.  If op2 is (statically or dynamically) equal to or
+larger than the number of bits in op1, the result is undefined.
 
 
 Example:
@@ -2555,7 +2555,7 @@
 Syntax:
 
 -  <result> = and <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = and <ty> <op1>, <op2>   ; yields {ty}:result
 
 
 Overview:
@@ -2614,7 +2614,7 @@
  'or' Instruction 
 
 Syntax:
-  <result> = or <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = or <ty> <op1>, <op2>   ; yields {ty}:result
 
 Overview:
 The 'or' instruction returns the bitwise logical inclusive
@@ -2669,7 +2669,7 @@
 Instruction 
 
 Syntax:
-  <result> = xor <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = xor <ty> <op1>, <op2>   ; yields {ty}:result
 
 Overview:
 The 'xor' instruction returns the bitwise logical exclusive
@@ -3805,7 +3805,7 @@
 
 
 Syntax:
-  <result> = icmp <cond> <ty> <var1>, <var2>   ; yields {i1}:result
+  <result> = icmp <cond> <ty> <op1>, <op2>   ; yields {i1}:result
 
 Overview:
 The 'icmp' instruction returns a boolean value based on comparison
@@ -3829,7 +3829,7 @@
 
The remaining two arguments must be integer or
 pointer typed. They must also be identical types.
 Semantics:
-The 'icmp' compares var1 and var2 according to 
+
The 'icmp' compares op1 and op2 according to 
 the condition code given as cond. The comparison performed always
 yields a i1 result, as follows: 
 

@@ -3839,21 +3839,21 @@
   ne: yields true if the operands are unequal, 
   false otherwise. No sign interpretation is necessary or performed.
   
ugt: interprets the operands as unsigned values and yields
-  true if var1 is greater than var2.
+  true if op1 is greater than op2.
   uge: interprets the operands as unsigned values and yields
-  true if var1 is greater than or equal to var2.
+  true if op1 is greater than or equal to op2.
   ult: interprets the operands as unsigned values and yields
-  true if var1 is less than var2.
+  true if op1 is less than op2.
   ule: interprets the operands as unsigned values and yields
-  true if var1 is less than or equal to var2.
+  true if op1 is less than or equal to op2.
   sgt: interprets the operands as signed values and yields
-  true if var1 is greater than var2.
+  true if op1 is greater than op2.
   sge: interprets the operands as signed values and yields
-  true if var1 is greater than or equal to var2.
+  true if op1 is greater than or equal to op2.
   slt: interprets the operands as signed values and yields
-  true if var1 is less than var2.
+  true if op1 is less than op2.
   sle: interprets the operands as signed values and yields
-  true if var1 is less than or equal to var2.
+  true if op1 is less than or equal to op2.
 
 If the operands are pointer typed, the pointer
 values are compared as if they were integers.
@@ -3873,7 +3873,7 @@
 
 
 Syntax:
-  <result> = fcmp <cond> <ty> <var1>, <var2>     ; yields {i1}:result
+  <result> = fcmp <cond> <ty> <op1>, <op2>     ; yields {i1}:result
 
 Overview:
 The 'fcmp' instruction returns a boolean value based on comparison
@@ -3906,36 +3906,36 @@
 floating point typed.  They must have identical 
 types.
 Semantics:
-The 'fcmp' instruction compares var1 and var2
+
The 'fcmp' instruction compares op1 and op2
 according to the condition code given as cond. The comparison performed 
 always yields a i1 result, as follows: 
 

   false: always yields false, regardless of operands.
   oeq: yields true if both operands are not a QNAN and 
-  var1 is equal to var2.
+  op1 is equal to op2.
   ogt: yields true if both operands are not a QNAN and
-  var1 is greather than var2.
+  op1 is greather than op2.
   oge: yields true if both operands are not a QNAN and 
-  var1 is greater than or equal to var2.
+  op1 is greater than or equal to op2.
   olt: yields true if both operands are not a QNAN and 
-  var1 is less than var2.
+  op1 is less than op2.
   ole: yields true if both operands are not a QNAN and 
-  var1 is less than or equal to var2.
+  op1 is less than or equal to op2.
   one: yields true if both operands are not a QNAN and 
-  var1 is not equal to var2.
+  op1 is not equal to op2.
   ord: yields true if both operands are not a QNAN.
   ueq: yields true if either operand is a QNAN or 
-  var1 is equal to var2.
+  op1 is equal to op2.
   ugt: yields true if either operand is a QNAN or 
-  var1 is greater than var2.
+  op1 is greater than op2.
   uge: yields true if either operand is a QNAN or 
-  var1 is greater than or equal to var2.
+  op1 is greater than or equal to op2.
   ult: yields true if either operand is a QNAN or 
-  var1 is less than var2.
+  op1 is less than op2.
   ule: yields true if either operand is a QNAN or 
-  var1 is less than or equal to var2.
+  op1 is less than or equal to op2.
   une: yields true if either operand is a QNAN or 
-  var1 is not equal to var2.
+  op1 is not equal to op2.
   uno: yields true if either operand is a QNAN.
   true: always yields true, regardless of operands.
 
@@ -3954,7 +3954,7 @@
 
 
 Syntax:
-  <result> = vicmp <cond> <ty> <var1>, <var2>   ; yields {ty}:result
+  <result> = vicmp <cond> <ty> <op1>, <op2>   ; yields {ty}:result
 
 Overview:
 The 'vicmp' instruction returns an integer vector value based on
@@ -3978,7 +3978,7 @@
 
The remaining two arguments must be vector of 
 integer typed. They must also be identical types.
 Semantics:
-The 'vicmp' instruction compares var1 and var2
+
The 'vicmp' instruction compares op1 and op2
 according to the condition code given as cond. The comparison yields a 
 vector of integer result, of
 identical type as the values being compared.  The most significant bit in each
@@ -4000,7 +4000,7 @@
 
 
 Syntax:
-  <result> = vfcmp <cond> <ty> <var1>, <var2>
+  <result> = vfcmp <cond> <ty> <op1>, <op2>
 Overview:
 The 'vfcmp' instruction returns an integer vector value based on
 element-wise comparison of its two floating point vector operands.  The output
@@ -4031,7 +4031,7 @@
 floating point typed. They must also be identical
 types.
 Semantics:
-The 'vfcmp' instruction compares var1 and var2
+
The 'vfcmp' instruction compares op1 and op2
 according to  the condition code given as cond. The comparison yields a 
 vector of integer result, with
 an identical number of elements as the values being compared, and each element




From baldrick at free.fr  Thu Aug  7 17:25:11 2008
From: baldrick at free.fr (Duncan Sands)
Date: Thu, 07 Aug 2008 22:25:11 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54491 - in
 /llvm-gcc-4.2/trunk/gcc/ada: Make-lang.in stub-ada.c
Message-ID: <200808072225.m77MPBJ0018372@zion.cs.uiuc.edu>

Author: baldrick
Date: Thu Aug  7 17:25:09 2008
New Revision: 54491

URL: http://llvm.org/viewvc/llvm-project?rev=54491&view=rev
Log:
Make it once more possible to compile the Ada
front-end using GNAT GPL 2006.  This method has
the advantage of the resulting compiler not
producing warnings about the size of the
restrictions symbol.

Added:
    llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c
Modified:
    llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in

Modified: llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in?rev=54491&r1=54490&r2=54491&view=diff

==============================================================================

--- llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in (original)
+++ llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in Thu Aug  7 17:25:09 2008
@@ -263,13 +263,20 @@
  ada/widechar.o   \
  $(EXTRA_GNATBIND_OBJS)
 
+# LLVM LOCAL begin
+stub-ada.o : ada/stub-ada.c
+	$(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) \
+		$(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION)
+# LLVM LOCAL end
+
 # List of extra object files linked in with various programs.
 EXTRA_GNAT1_OBJS = prefix.o
-EXTRA_GNATBIND_OBJS = prefix.o version.o
+# LLVM LOCAL
+EXTRA_GNATBIND_OBJS = prefix.o version.o stub-ada.o
 
 # Language-independent object files.
 # LLVM LOCAL
-ADA_BACKEND = $(BACKEND) attribs.o stub-objc.o stub-c.o
+ADA_BACKEND = $(BACKEND) attribs.o stub-objc.o stub-c.o stub-ada.o
 
 # List of target dependent sources, overridden below as necessary
 TARGET_ADA_SRCS =

Added: llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c?rev=54491&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c (added)
+++ llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c Thu Aug  7 17:25:09 2008
@@ -0,0 +1,24 @@
+/* LLVM LOCAL file */
+/* Stub functions for Ada language routines that are referenced
+   from the back-end.
+   Copyright (C) 2008 Free Software Foundation, Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+GCC is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING.  If not, write to the Free
+Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.  */
+
+/* Needed when building with GNAT GPL 2006.  */
+char system__restrictions__run_time_restrictions[1024] __attribute__ ((weak));




From isanbard at gmail.com  Thu Aug  7 18:15:42 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Thu, 07 Aug 2008 23:15:42 -0000
Subject: [llvm-commits] [llvm] r54494 -
	/llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp
Message-ID: <200808072315.m77NFgAg019834@zion.cs.uiuc.edu>

Author: void
Date: Thu Aug  7 18:15:41 2008
New Revision: 54494

URL: http://llvm.org/viewvc/llvm-project?rev=54494&view=rev
Log:
Pull r53924 into llvmCore-2062:

Handle llvm wrappers.

Modified:
    llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp

Modified: llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp?rev=54494&r1=54493&r2=54494&view=diff

==============================================================================
--- llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp (original)
+++ llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp Thu Aug  7 18:15:41 2008
@@ -194,7 +194,10 @@
   std::string actualMagic;
   if (!getMagicNumber(actualMagic, 4))
     return false;
-  return actualMagic == "BC\xC0\xDE";
+  LLVMFileType FT =
+    IdentifyFileType(actualMagic.c_str(),
+                     static_cast(actualMagic.length()));
+  return FT == Bitcode_FileType;
 }
 
 bool Path::hasMagicNumber(const std::string &Magic) const {




From isanbard at gmail.com  Thu Aug  7 19:48:50 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 00:48:50 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54495 - /llvm-gcc-4.2/trunk/build_gcc
Message-ID: <200808080048.m780mpSN022566@zion.cs.uiuc.edu>

Author: void
Date: Thu Aug  7 19:48:48 2008
New Revision: 54495

URL: http://llvm.org/viewvc/llvm-project?rev=54495&view=rev
Log:
Don't specify --with-gxx-include-dir. We use the system's g++ include directory.


Modified:
    llvm-gcc-4.2/trunk/build_gcc

Modified: llvm-gcc-4.2/trunk/build_gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=54495&r1=54494&r2=54495&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/build_gcc (original)
+++ llvm-gcc-4.2/trunk/build_gcc Thu Aug  7 19:48:48 2008
@@ -120,8 +120,8 @@
 if [ ! -d "/usr/include/c++/$LIBSTDCXX_VERSION" ]; then
   LIBSTDCXX_VERSION=4.0.0
 fi
+#NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=\${prefix}/include/c++/$LIBSTDCXX_VERSION"
 # LLVM LOCAL end
-NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=\${prefix}/include/c++/$LIBSTDCXX_VERSION"
 
 DARWIN_VERS=`uname -r | sed 's/\..*//'`
 echo DARWIN_VERS = $DARWIN_VERS




From isanbard at gmail.com  Thu Aug  7 19:50:18 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 00:50:18 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54496 - in
 /llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg: 5938756.m AppDelegate.h
 AppDelegate.m cfstring-nsstring-type.m compatibility-alias.m
 dwarf-prototypes.m encode-int128_t.m method-attribute-4.m objc-6061276.m
 objc-foreach-syntax.m objc-getter-bug.m objc2-6003871.m
 objc2-ivar-offset-2.m property-id-proto-getter.m property-in-category.m
 property-setter-bug.m property-specialized-1.m property-specialized-2.m
 super-after-trycatch.m sync-objc-exception.m
Message-ID: <200808080050.m780oJf3022635@zion.cs.uiuc.edu>

Author: void
Date: Thu Aug  7 19:50:18 2008
New Revision: 54496

URL: http://llvm.org/viewvc/llvm-project?rev=54496&view=rev
Log:
Sync up the objc.dg testsuite with Apple's GCC testsuite.

Added:
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m
    llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,24 @@
+/* APPLE LOCAL file 5938756 */
+/* This code caused an ICE */
+/* { dg-do compile } */
+/* { dg-options "-gdwarf-2 -Os" } */
+
+ at class NSException;
+
+struct empty {
+};
+
+ at interface PC {
+}
+ at end
+
+ at implementation PC
+- (id) fn {
+  signed char isSet = 0;
+  struct empty sb;
+  if (isSet) {
+    @try { }
+    @catch (NSException *localException) { }
+  }
+}
+ at end 

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h Thu Aug  7 19:50:18 2008
@@ -0,0 +1,13 @@
+/* APPLE LOCAL file radar 5839812 - synthesized methods should be given
+   the location of the '@synthesize' statement.  */
+/*  AppDelegate.m, AppDelegate.h  */
+
+#import 
+
+ at interface AppDelegate : NSObject {
+    NSString *name;
+}
+
+ at property (retain) NSString *name;
+
+ at end

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,18 @@
+/* APPLE LOCAL file radar 5839812 - synthesized methods should be given
+   the location of the '@synthesize' statement.  */
+/*  AppDelegate.m, AppDelegate.h  */
+/* { dg-do compile } */
+/* { dg-options " -O0 -gdwarf-2 -c -dA -mmacosx-version-min=10.5" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-final { scan-assembler "AppDelegate.m:12" } } */
+
+#import "AppDelegate.h"
+
+ at implementation AppDelegate
+
+ at synthesize name;
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
+    self.name = @"Fred";
+}
+ 
+ at end

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,31 @@
+/* APPLE LOCAL file radar 5982789 */
+/* Type of a CFString literal is NSString. This test case
+   should not issue any warning as "length" is a method 
+   in NSString class.
+*/
+/* { dg-options "-Wall -Werror" } */
+/* { dg-do compile } */
+
+#import 
+
+ at interface MyTestClassA : NSObject
+{
+}
+- (short) length;
+ at end
+
+ at implementation MyTestClassA
+- (short) length;
+{
+    return 1;
+}
+ at end
+
+
+int main (int argc, const char * argv[])
+{    
+    NSUInteger testLen = [@"teststring" length];
+    NSLog(@"teststring: %ld", (long)testLen);
+        
+    return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,21 @@
+/* APPLE LOCAL file radar 5835805 */
+/* Test use of alias class name in defining a new class and its super class
+   results in proper diagnostics if class/super class is being mis-used.
+*/
+/* { dg-do compile } */
+
+ at interface Super @end
+
+ at interface MyWpModule @end
+
+ at compatibility_alias  MyAlias MyWpModule;
+
+ at compatibility_alias  AliasForSuper Super;
+
+ at interface MyAlias : AliasForSuper // expected-error {{duplicate interface declaration for class 'MyWpModule'}}
+ at end /* { dg-error "duplicate interface declaration for class 'MyWpModule'" } */
+     /* { dg-error "redefinition of 'struct MyWpModule'" "" { target *-*-* } 16 } */
+
+ at implementation MyAlias : AliasForSuper /* { dg-error "conflicting super class name 'Super'" } */
+ at end
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,19 @@
+/* APPLE LOCAL file radar 4355182 */
+/* Check that AT_prototyped is generated for objective-c as well. */
+/* { dg-options "-mmacosx-version-min=10.5 -gdwarf-2 -dA" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-gdwarf-2 -dA" { target arm*-*-darwin* } } */
+/* { dg-final { scan-assembler "DW_AT_prototyped" } } */
+
+int foo (int);
+
+int
+foo (int x)
+{
+  return x;
+}
+
+int 
+main (int argc, char *argv)
+{
+  return foo (5);
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,16 @@
+/* APPLE LOCAL file radar 5996271 */
+/* encodeing support for 128-bit ints. */
+/* { dg-do run } */
+
+extern void abort(void);
+
+int main () {
+#if __LP64__
+    if (@encode(__uint128_t)[0] != 'T')
+      abort();
+    if (@encode(__int128_t)[0] != 't')
+      abort();
+#endif
+    return 0;
+}
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,21 @@
+/* APPLE LOCAL file radar 6049617 */
+/* Test of implementation of method attributes on class methods. */
+/* { dg-do compile } */
+
+ at interface NSString 
+- (const char *)lossyCString __attribute__((deprecated));
++ (const char *)stringWithContentsOfFile __attribute__((deprecated));
+ at end
+
+void foo (NSString *p)
+{
+	id pid;
+        Class pclass;
+
+	[p lossyCString];	/* { dg-warning "\\'lossyCString\\' is deprecated" } */
+	[NSString stringWithContentsOfFile]; /* { dg-warning "\\'stringWithContentsOfFile\\' is deprecated" } */
+
+	[pid lossyCString];			// OK
+	[pclass stringWithContentsOfFile];      // OK
+}
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,35 @@
+/* APPLE LOCAL file radar 6061276 */
+/* Corner protocol case should not result in any warning on line 32 */
+/* { dg-do compile } */
+
+#import 
+
+
+ at class ASTNode;
+
+ at protocol ScopeLookup 
+- (ASTNode*) containingScope;
+ at end
+
+ at interface ASTNode : NSObject {}
+ at end
+
+ at implementation ASTNode
+ at end
+
+ at interface Expression : ASTNode {}
+ at end
+
+ at implementation Expression
+- (ASTNode*) containingScope { return nil; }
+ at end
+
+ at interface DeclarationContainingStatement : Expression  {}
+ at end
+
+ at implementation DeclarationContainingStatement 
+- (void)dummy {
+    ASTNode *containingScope = [self containingScope];
+    if (containingScope) {}
+}
+ at end

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,9 @@
+/* APPLE LOCAL file radar 5925639 */
+/* { dg-options "-std=c99 -mmacosx-version-min=10.5" } */
+/* { dg-do compile } */
+
+static int test_NSURLGetResourceValueForKey( id keys )
+{
+ for ( id key; in keys) { /* { dg-error "expected expression before" } */
+  } 
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,41 @@
+/* APPLE LOCAL file radar 5822637 */
+/* Check that receiver of a getter call which is a messaging expression
+   does not call the message more than once. */
+/* { dg-options "-mmacosx-version-min=10.5 -framework Foundation" } */
+/* { dg-do run } */
+
+#include 
+
+static int c;
+
+ at interface I : NSObject
+{
+	int count;
+}
+- (NSArray *)processResults;
+- (int) Another;
+ at end
+
+ at implementation I
+
+- (NSArray *)processResults 
+{
+    ++c;
+    return nil;
+}
+
+- (int) Another
+{
+int totalResults = [self processResults].count;
+return 0;
+}
+ at end
+
+int main()
+{
+	I* p = [[I alloc] init];
+	[p Another];
+
+	return c-1;
+}
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,18 @@
+/* APPLE LOCAL file radar 6003871 */
+/* { dg-do compile { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-fnext-runtime -fobjc-gc" } */
+/* { dg-do compile } */
+
+#import "Cocoa/Cocoa.h"
+
+ at interface TEST : NSObject 
+{
+        
+        int *filesEnt[3000000];
+}
+ at end
+
+
+ at implementation TEST
+ at end
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,18 @@
+/* APPLE LOCAL file radar 5724385 */
+/* Test that alignment of a bitfield is alignment of its underlying type. */
+/* { dg-options "-std=c99 -mmacosx-version-min=10.5 -m64" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-std=c99" { target arm*-*-darwin* } } */
+/* { dg-do compile { target *-*-darwin* } } */
+
+ at interface Foo {
+ at private
+    int first;
+    int :1;
+    int third :1;
+    int :1;
+    int fifth :1;
+}
+ at end
+ at implementation Foo 
+ at end
+/* { dg-final { scan-assembler "\t.quad\t_OBJC_IVAR_\\\$_Foo.third\n\t.quad\tL_OBJC_METH_VAR_NAME_1\n\t.quad\tL_OBJC_METH_VAR_TYPE_1\n\t.long\t2" } } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,20 @@
+/* APPLE LOCAL file radar 5893391 */
+/* Test that property-style getter call syntax can be used on objects
+   of 'id' type qualified by protocols which implement the getter
+   method declared in that protocol. */
+/* { dg-options "-mmacosx-version-min=10.5 -framework Foundation -fobjc-gc" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-do run { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+
+#include 
+
+int main()
+{
+        id spam = [NSArray arrayWithObjects:@"Spam", @"spam", nil];
+        NSString *spamText= [ spam description ];
+        id eggs = [NSArray arrayWithObjects:@"Spam", @"spam", nil];
+        NSString *eggsText= eggs.description;
+        NSObject *bacon = [NSArray arrayWithObjects:@"Spam", @"spam", nil];
+        NSString *baconText= bacon.description;
+        NSLog(@"spam=%@, eggs=%@, bacon=%@", spamText, eggsText, baconText);
+	return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,32 @@
+/* APPLE LOCAL file radar 5962694 */
+/* Test that a property declared in category's protocol list can be
+   synthesize (dynamic only) in category's implementation. */
+/* { dg-options "-mmacosx-version-min=10.5" { target *-*-darwin* } } */
+/* { dg-do compile { target *-*-darwin* } } */
+
+#import 
+
+ at protocol MyProtocol
+ at property float                 myFloat;
+ at end
+
+ at interface MyObject : NSObject {
+        }
+ at end
+
+ at interface MyObject (MyProtocol) 
+ at end
+
+ at implementation MyObject (MyProtocol)
+ at dynamic myFloat;
+ at end
+
+int main (int argc, const char * argv[]) {
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+
+    // insert code here...
+    NSLog(@"Hello, World!");
+    [pool drain];
+    return 0;
+}
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,86 @@
+/* APPLE LOCAL file radar 5852190 */
+/* { dg-options "-mmacosx-version-min=10.5 -framework Cocoa" } */
+/* { dg-do run { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+
+#import 
+
+ at interface Foo : NSObject
+{
+ at public
+	BOOL _gratuitousBool;
+	NSString* _assignedString;
+	NSString* _retainedString;
+	NSString* _copiedString;
+}
+
+ at property BOOL gratuitousBool;
+ at property (assign) NSString* assignedString;
+ at property (retain) NSString* retainedString;
+ at property (copy) NSString* copiedString;
+
+- (BOOL)gratuitousBool;
+- (NSString*)assignedString;
+- (NSString*)retainedString;
+- (NSString*)copiedString;
+
+-(void)setGratuitousBool:(BOOL)gratuitousBool;
+-(void)setAssignedString:(NSString*)assignedString;
+-(void)setRetainedString:(NSString*)retainedString;
+-(void)setCopiedString:(NSString*)copiedString;
+
+ at end
+
+//---------------------------------------------------------------------------
+
+ at implementation Foo
+
+ at synthesize gratuitousBool = _gratuitousBool;
+ at synthesize assignedString = _assignedString;
+ at synthesize retainedString = _retainedString;
+ at synthesize copiedString = _copiedString;
+
+- (id)init
+{
+	self = [super init];
+	if(self == nil) return nil;
+	
+	self.gratuitousBool = YES;
+	self.assignedString = @"AssignedString";
+	self.retainedString = @"RetainedString";
+	self.copiedString = @"CopiedString";
+	
+	return self;
+}
+
+ at end
+
+//***************************************************************************
+
+static void TestGratuitousBool(Foo* foo)
+{
+	NSLog(@"gratuitousBool initial value: %d", foo.gratuitousBool);
+        if (foo.gratuitousBool != YES)
+	  abort();
+	foo.gratuitousBool = NO;
+	NSLog(@"gratuitousBool new value: %d", foo.gratuitousBool);
+	if (foo.gratuitousBool != NO)
+	  abort();
+
+	const BOOL oldGratuitousBool = foo.gratuitousBool;
+	foo->_gratuitousBool = YES;
+	NSCAssert(foo.gratuitousBool == YES, @"-gratuitousBool is borked");
+	foo->_gratuitousBool = oldGratuitousBool;
+}
+
+int main(const int argc, const char* const argv[])
+{
+	NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init];
+	
+	Foo* foo = [[Foo alloc] init];
+	
+	TestGratuitousBool(foo);
+	
+	[pool release];
+		  
+	return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,26 @@
+/* APPLE LOCAL file radar 5218071 */
+/* Test that property type in the derived class can be more specialized than
+   that of its base class.
+*/
+/* { dg-options "-mmacosx-version-min=10.5" } */
+/* { dg-do compile } */
+
+ at protocol P1 @end
+ at protocol P2 @end
+ at protocol P3 @end
+
+ at interface NSData @end
+
+ at interface MutableNSData : NSData @end
+
+ at interface Base 
+ at property(readonly) id ref;
+ at property(readonly) id another_ref;
+ at property (readonly) NSData *nsdata;
+ at end
+
+ at interface Derived : Base
+ at property (readonly, assign) NSData *ref;
+ at property(readonly) NSData * another_ref;
+ at property (readonly) NSData * nsdata;
+ at end

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,36 @@
+/* APPLE LOCAL file radar 5218071 */
+/* Test that property type in the derived class can be more specialized than
+   that of its base class. Issue warning when this is not the case.
+*/
+/* { dg-options "-mmacosx-version-min=10.5" } */
+/* { dg-do compile } */
+
+ at protocol P1 @end
+ at protocol P2 @end
+ at protocol P3 @end
+
+ at interface NSData @end
+
+ at interface MutableNSData : NSData @end
+
+ at interface Base : NSData 
+ at property(readonly) id ref;
+ at property(readonly) Base *p_base;
+ at property(readonly) NSData *nsdata;
+ at property(readonly) NSData * m_nsdata;
+ at end
+
+ at interface Data : Base 
+ at property(readonly) NSData *ref;
+ at property(readonly) Data *p_base;	// warn
+ at property(readonly) MutableNSData * m_nsdata;
+ at end /* { dg-warning "property 'p_base' type does not match super class 'Base' property type" } */
+
+ at interface  MutedData: Data
+ at property(readonly) id p_base;
+ at end	/* { dg-warning "property 'p_base' type does not match super class 'Data' property type" } */
+
+ at interface ConstData : Data 
+ at property(readonly) ConstData *p_base;
+ at end /* { dg-warning "property 'p_base' type does not match super class 'Data' property type" } */
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,27 @@
+/* APPLE LOCAL file radar 6023694 */
+/* Test that no bogus warning is issued as the result of
+   'super' being 'volatized' for a try-catch statement. */
+/* { dg-options "-Wall" } */
+/* { dg-do compile } */
+
+ at interface NSObject {
+}
+- (unsigned)retainCount;
+ at end
+
+ at interface Foo : NSObject {
+}
+ at end
+
+ at implementation Foo
+
+- (unsigned)retainCount
+{
+        [super retainCount];
+ @try {
+ } @catch(id anything) {
+ }
+ return [super retainCount];
+}
+
+ at end

Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m?rev=54496&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m Thu Aug  7 19:50:18 2008
@@ -0,0 +1,27 @@
+/* APPLE LOCAL file radar 5982990 */
+/* This tests that local variables declared in @synchronized block
+   have are make volatile. Test should compile with no warning or
+   error.
+*/
+/* { dg-do compile { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-fobjc-exceptions -Os -Wextra -Werror" } */
+/* { dg-skip-if "" { *-*-darwin* } { "-m64" } { "" } } */
+ 
+struct MyPoint { int x; };
+
+ at interface MyObject {}
++(void) doNothingWithPoint:(struct MyPoint)aPoint;
+ at end
+
+int main()
+{
+    id  pool = 0;
+	
+    @synchronized(pool)
+	{
+		struct MyPoint thePoint;
+		[MyObject doNothingWithPoint:thePoint];
+	}
+	
+    return 0;
+}




From isanbard at gmail.com  Thu Aug  7 19:51:11 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 00:51:11 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54497 - in
 /llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg: cfstring-nsstring-type.mm
 inline-func-access-category.mm objc-gc-static-init.mm
 property-getter-codegen.mm property-id-proto-getter.mm
 property-reference-1.mm property-reference-2.mm property-reference-3.mm
 sync-objc-exception.mm template-in-impl.mm utf16string-in-functemplate.mm
Message-ID: <200808080051.m780pBUn022680@zion.cs.uiuc.edu>

Author: void
Date: Thu Aug  7 19:51:11 2008
New Revision: 54497

URL: http://llvm.org/viewvc/llvm-project?rev=54497&view=rev
Log:
Sync up obj-c++.dg testsuites with Apple's GCC obj-c++.dg.

Added:
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/cfstring-nsstring-type.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/inline-func-access-category.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-gc-static-init.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-getter-codegen.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-id-proto-getter.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-1.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-2.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-3.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/sync-objc-exception.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/template-in-impl.mm
    llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/utf16string-in-functemplate.mm

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/cfstring-nsstring-type.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/cfstring-nsstring-type.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/cfstring-nsstring-type.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/cfstring-nsstring-type.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,31 @@
+/* APPLE LOCAL file radar 5982789 */
+/* Type of a CFString literal is NSString. This test case
+   should not issue any warning as "length" is a method 
+   in NSString class.
+*/
+/* { dg-options "-Wall -Werror" } */
+/* { dg-do compile } */
+
+#include 
+
+ at interface MyTestClassA : NSObject
+{
+}
+- (short) length;
+ at end
+
+ at implementation MyTestClassA
+- (short) length;
+{
+    return 1;
+}
+ at end
+
+
+int main (int argc, const char * argv[])
+{    
+    NSUInteger testLen = [@"teststring" length];
+    NSLog(@"teststring: %ld", (long)testLen);
+        
+    return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/inline-func-access-category.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/inline-func-access-category.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/inline-func-access-category.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/inline-func-access-category.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,22 @@
+/* APPLE LOCAL file radar 5471096 */
+/* Test that an inlinable function in cateogry block has access to
+   protected/private member of its class though pointer to the class. */
+/* { dg-do compile } */
+
+ at interface B 
+  {
+    int intValue;
+  }
+ at end
+
+
+ at interface B()
+
+inline static int B_intValue(B *self)
+  { return self->intValue; }
+
+ at end
+
+ at implementation B
+
+ at end

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-gc-static-init.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/objc-gc-static-init.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-gc-static-init.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-gc-static-init.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,47 @@
+/* APPLE LOCAL file radar 5733674 */
+/* Test that static GC'able objects are garbage collected by generating write barrier. 
+   Test should build and run. */
+/* { dg-options "-fobjc-gc -mmacosx-version-min=10.5 -framework Foundation" } */
+/* { dg-do run { target *-*-darwin* } } */
+/* { dg-require-effective-target objc_gc } */
+
+#import 
+
+ at interface Test : NSObject
+{
+}
+ at end
+ at implementation Test
+
+static NSString *createMacOSXVersionString()
+{
+    return [[NSString alloc] initWithString:[[NSDate date] description]];
+}
+
+- (void)getString
+{
+    static NSString *string = createMacOSXVersionString();
+    NSLog(@"string: %@", string);
+    NSLog(@"string: %p", string);
+}
+
+ at end
+
+
+
+int main (int argc, const char * argv[]) {
+    NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+    
+    Test *testClass = [[Test alloc] init];
+    unsigned counter, max = 4;
+    for (counter = 0; counter < max; counter++) {
+        [testClass getString];
+        [[NSGarbageCollector defaultCollector] collectExhaustively];
+    }
+    [testClass release];
+    
+    // insert code here...
+    NSLog(@"Hello, World!");
+    [pool drain];
+    return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-getter-codegen.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-getter-codegen.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-getter-codegen.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-getter-codegen.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,115 @@
+/* APPLE LOCAL file radar 5802025 */
+/* This test case used to ICE because we did not generate a getter call from
+   OBJC_PROPERTY_REFERENCE_EXPR in time to access the property getter value when
+   getter is retuning a class.
+*/
+/* { dg-options "-mmacosx-version-min=10.5 -framework Foundation" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-framework Foundation" { target arm*-*-darwin* } } */
+/* { dg-do run { target *-*-darwin* } } */
+
+#import 
+#import 
+
+class Vector3D
+{
+	public:
+		float x, y, z;
+	
+	public:
+		Vector3D();
+		Vector3D(const Vector3D &inVector);
+		Vector3D(float initX, float initY, float initZ);
+		Vector3D &operator=(const Vector3D & rhs);
+		
+		NSString *description();
+};
+
+Vector3D::Vector3D()
+{
+	x = y = z = 0;
+}
+
+Vector3D::Vector3D(const Vector3D &inVector)
+{
+	x = inVector.x;
+	y = inVector.y;
+	z = inVector.z;
+}
+
+Vector3D::Vector3D(float initX, float initY, float initZ)
+{
+	x = initX;
+	y = initY;
+	z = initZ;
+}
+
+Vector3D &Vector3D::operator=(const Vector3D & rhs)
+{
+	x = rhs.x;
+	y = rhs.y;
+	z = rhs.z;
+	
+	return *this;
+}
+
+NSString *Vector3D::description()
+{
+	return [NSString stringWithFormat: @"(%f, %f, %f)", x, y, z];
+}
+
+ at interface Object3D : NSObject
+{
+	Vector3D position;
+}
+
+ at property (assign) Vector3D position;
+ at end
+
+static int count;
+
+ at implementation Object3D
+
+ at synthesize position;
+
+- (id) init
+{
+	self = [super init];
+	if(self)
+	{
+		position = Vector3D(0, 0, 0);
+	}
+	
+	return self;
+}
+
+- (void) setPosition: (Vector3D) inPosition
+{
+	position = inPosition;
+	NSLog(@"setPosition was called with the vector %@", inPosition.description());
+	++count;
+}
+ at end
+
+int main (int argc, const char * argv[]) 
+{
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+
+	Object3D *myObject = [[Object3D alloc] init];
+	
+	// Each of these looks like it should call the setPosition method.  However,
+	// if the Vector3D copy constructor is defined, this one won't.
+	myObject.position = Vector3D(1.0f, 1.0f, 1.0f);
+	NSLog(@"After assignment the position is: %@", myObject.position.description());
+
+	[myObject setPosition: Vector3D(2.0f, 2.0f, 2.0f)];
+	NSLog(@"After setPosition: the position is: %@", myObject.position.description());
+
+	typedef void (*SetPositionIMP)(id self, SEL _cmd, Vector3D position);
+	((SetPositionIMP)objc_msgSend)(myObject, @selector(setPosition:), Vector3D(3.0f, 3.0f, 3.0f));
+	NSLog(@"After objc_msgSend the position is: %@", myObject.position.description());
+
+	[pool release];
+        if (count != 3)
+	 abort();
+        return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-id-proto-getter.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-id-proto-getter.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-id-proto-getter.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-id-proto-getter.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,20 @@
+/* APPLE LOCAL file radar 5893391 */
+/* Test that property-style getter call syntax can be used on objects
+   of 'id' type qualified by protocols which implement the getter
+   method declared in that protocol. */
+/* { dg-options "-mmacosx-version-min=10.5 -framework Foundation -fobjc-gc" { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-do run { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+
+#include 
+
+int main()
+{
+        id spam = [NSArray arrayWithObjects:@"Spam", @"spam", nil];
+        NSString *spamText= [ spam description ];
+        id eggs = [NSArray arrayWithObjects:@"Spam", @"spam", nil];
+        NSString *eggsText= eggs.description;
+        NSObject *bacon = [NSArray arrayWithObjects:@"Spam", @"spam", nil];
+        NSString *baconText= bacon.description;
+        NSLog(@"spam=%@, eggs=%@, bacon=%@", spamText, eggsText, baconText);
+	return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-1.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-reference-1.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-1.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-1.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,28 @@
+/* APPLE LOCAL file radar 6029624 */
+/* Test for const refrence property types. */
+/* { dg-options "-mmacosx-version-min=10.5" } */
+/* { dg-do compile { target *-*-darwin* } } */
+
+struct MyStruct
+{
+        float x;
+        float y;
+        float z;
+};
+
+ at interface MyClass
+{
+        MyStruct foo;
+}
+
+ at property (assign, readwrite) const MyStruct& foo;
+ at property (assign, readwrite) const MyStruct& Myfoo;
+
+ at end
+
+ at implementation MyClass
+
+ at synthesize Myfoo = foo;
+ at synthesize foo;
+
+ at end

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-2.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-reference-2.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-2.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-2.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,25 @@
+/* APPLE LOCAL file radar 6029624 */
+/* Test for const refrence property types. */
+/* { dg-options "-m64 -mmacosx-version-min=10.5" } */
+/* { dg-do compile { target *-*-darwin* } } */
+
+struct MyStruct
+{
+        float x;
+        float y;
+        float z;
+};
+
+ at interface MyClass
+
+ at property (assign, readwrite) const MyStruct& foo;
+ at property (assign, readwrite) const MyStruct& Myfoo;
+
+ at end
+
+ at implementation MyClass
+
+ at synthesize Myfoo;
+ at synthesize foo;
+
+ at end

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-3.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-reference-3.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-3.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-3.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,51 @@
+/* APPLE LOCAL file radar 6029577 */
+/* Test for correct generation of getters which return reference typed ivars. */
+/* { dg-options "-framework Foundation -mmacosx-version-min=10.5" } */
+/* { dg-do run { target *-*-darwin* } } */
+
+#include 
+
+struct MyStruct
+{
+	int x;
+	int y;
+	int z;
+};
+
+ at interface MyClass : NSObject
+{
+	MyStruct _foo;
+}
+
+ at property (assign, readwrite) const MyStruct& foo;
+
+- (const MyStruct&) foo;
+- (void) setFoo:(const MyStruct&)inFoo;
+ at end
+
+ at implementation MyClass
+
+- (const MyStruct&) foo
+{
+	return _foo;
+}
+
+- (void) setFoo:(const MyStruct&)inFoo
+{
+	_foo = inFoo;
+}
+ at end
+
+int main()
+{
+	MyClass* myClass = [[MyClass alloc] init];
+		
+	MyStruct myStruct = (MyStruct){1, 2, 3};
+	myClass.foo = myStruct;
+
+	const MyStruct& currentMyStruct = myClass.foo;   
+        if (currentMyStruct.x != 1 || currentMyStruct.y != 2 || currentMyStruct.z != 3)
+	  abort();
+	return 0;
+}
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/sync-objc-exception.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/sync-objc-exception.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/sync-objc-exception.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/sync-objc-exception.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,27 @@
+/* APPLE LOCAL file radar 5982990 */
+/* This tests that local variables declared in @synchronized block
+   have are make volatile. Test should compile with no warning or
+   error.
+*/
+/* { dg-do compile { target powerpc*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-fobjc-exceptions -Os -Wextra -Werror" } */
+/* { dg-skip-if "" { *-*-darwin* } { "-m64" } { "" } } */
+ 
+struct MyPoint { int x; };
+
+ at interface MyObject {}
++(void) doNothingWithPoint:(struct MyPoint)aPoint;
+ at end
+
+int main()
+{
+    id  pool = 0;
+	
+    @synchronized(pool)
+	{
+		struct MyPoint thePoint;
+		[MyObject doNothingWithPoint:thePoint];
+	}
+	
+    return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/template-in-impl.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/template-in-impl.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/template-in-impl.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/template-in-impl.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,25 @@
+/* APPLE LOCAL file radar 5976344 */
+/* Test that class template can be properly parsed and handled inside
+   an @implementation. */
+
+/* { dg-do compile } */
+
+template  struct TemplateDeclarationIsFineHere {};
+
+template  struct Template2 {};
+
+ at interface Test @end
+
+ at implementation Test
+
+- (void) test {
+        Template2 youCanInstantiateTemplatesNoProblem();
+}
+
+template  struct TemplateDeclarationIsNoGoodHere {};
+
+- (TemplateDeclarationIsNoGoodHere*) Meth { return 0; }
+
+
+ at end
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/utf16string-in-functemplate.mm
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/utf16string-in-functemplate.mm?rev=54497&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/utf16string-in-functemplate.mm (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/utf16string-in-functemplate.mm Thu Aug  7 19:51:11 2008
@@ -0,0 +1,13 @@
+/* APPLE LOCAL file radar 5887355 */
+/* Test correct generation of utf16-string in a function template. */
+/* { dg-options "-framework Cocoa" } */
+/* { dg-do run { target *-*-darwin* } } */
+
+#import 
+
+template  NSString* test (T i) { return @"??ble"; }
+
+main () { 
+   NSLog (@"string: %@", test(42)); 
+   return 0;
+}




From isanbard at gmail.com  Thu Aug  7 19:52:12 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 00:52:12 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54498 -
 /llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c
Message-ID: <200808080052.m780qCEX022716@zion.cs.uiuc.edu>

Author: void
Date: Thu Aug  7 19:52:12 2008
New Revision: 54498

URL: http://llvm.org/viewvc/llvm-project?rev=54498&view=rev
Log:
Sync up the gcc.c-torture/execute testsuites with Apple's GCC testsuite.

Added:
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c?rev=54498&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c Thu Aug  7 19:52:12 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file mainline aligned functions 5933878 */
+void func(void) __attribute__((aligned(256)));
+
+void func(void)
+{
+}
+
+int main()
+{
+  if (((long)func & 0xFF) != 0)
+    abort ();
+  if (__alignof__(func) != 256)
+    abort ();
+  return 0;
+}




From isanbard at gmail.com  Thu Aug  7 20:03:12 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 01:03:12 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54499 -
	/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/
Message-ID: <200808080103.m7813DkZ023080@zion.cs.uiuc.edu>

Author: void
Date: Thu Aug  7 20:03:11 2008
New Revision: 54499

URL: http://llvm.org/viewvc/llvm-project?rev=54499&view=rev
Log:
Add non-blocks tests. Blocks tests will come later with a blocks support update.


Added:
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c
    llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,45 @@
+/* APPLE LOCAL file 5774356 */
+/* { dg-do run { target powerpc*-*-* } } */
+/* { dg-require-effective-target powerpc_altivec_ok } */
+
+#include 
+#include 
+
+#define NOINLINE __attribute__ ((__noinline__))
+
+typedef int __attribute__((vector_size(16))) v4si;
+
+int global_count;
+v4si ref1 = { 1, 1, 1, 1 };
+v4si ref2 = { 2, 2, 2, 2 };
+v4si var1 = { 1, 1, 1, 1 };
+v4si var2 = { 2, 2, 2, 2 };
+
+void NOINLINE f0 ()
+{
+  global_count++;
+}
+
+void NOINLINE f1 ()
+{
+  v4si t = var1;
+  f0 ();
+  var1 = t;
+}
+
+void NOINLINE f2 ()
+{
+  v4si t = var2;
+  f1 ();
+  var2 = t;
+}
+
+main ()
+{
+  f2 ();
+  if (!vec_all_eq (var1, ref1))
+    abort ();
+  if (!vec_all_eq (var2, ref2))
+    abort ();
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,21 @@
+/* APPLE LOCAL file 5799099 */
+/* { dg-do compile } */
+/* { dg-options "-O" } */
+typedef struct CGSZone {
+  void *context;
+  void (*free)(void *context, void *ptr);
+} CGSZone;
+
+static void
+CGSZoneFree(CGSZone *zone, void *ptr)
+{
+  (*zone->free)(zone->context, ptr);
+}
+
+void
+release_bitmap_data(void *info, const void *data)
+{
+  /* The compiler should not warn when we explicitly cast away "const"
+     here: */
+  CGSZoneFree(info, (void *)data);
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,12 @@
+/* APPLE LOCAL file 5951842 */
+/* { dg-do compile { target "i?86-*-darwin*" } } */
+/* { dg-options "-O1" } */
+  /* Should generate one SSE2 insn; under -O1 -m64, was shifting in rdx:rax.  */
+/* { dg-final { scan-assembler "psrldq" } } */
+#include 
+__m128i
+f (__m128i v_row)
+{
+  /* This is a 40-bit left shift.  */
+  return _mm_srli_si128(v_row, 5);
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,20 @@
+/* APPLE LOCAL file 4382996 */
+/* Verify that the result of a binary operator != 0 doesn't generate a
+   redundant move instruction.  */
+
+/* { dg-do compile { target arm*-*-darwin* } } */
+/* { dg-options "-Os" } */
+/* { dg-skip-if "Not valid with -mthumb" { *-*-* } { "-mthumb" } { "" } } */
+
+int test_plus     (int a, int b) { return (a + b) != 0; }
+int test_and      (int a, int b) { return (a & b) != 0; }
+int test_minus    (int a, int b) { return (a - b) != 0; }
+int test_mult     (int a, int b) { return (a * b) != 0; }
+int test_ior      (int a, int b) { return (a | b) != 0; }
+int test_xor      (int a, int b) { return (a ^ b) != 0; }
+int test_ashift   (int a, int b) { return (a << b) != 0; }
+int test_ashiftrt (int a, int b) { return (a >> b) != 0; }
+unsigned int test_lshiftrt (unsigned int a, unsigned int b) { return (a >> b) != 0; }
+
+/* { dg-final { scan-assembler-times "movne" 9 } } */
+/* { dg-final { scan-assembler-not "moveq" } } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,63 @@
+/* APPLE LOCAL file bswap support */
+/* Test for generation of architecture-specific endianness-swap instructions. */
+/* { dg-do compile } */
+
+/* These tests should work at -O1 and above.  */
+/* { dg-options "-O1 -std=gnu99" } */
+
+extern void abort(void);
+typedef unsigned int uint32;
+typedef unsigned long long uint64;
+uint32 Reverse1 (uint32) __attribute__((noinline));
+uint32 Reverse2 (uint32) __attribute__((noinline));
+unsigned int Reverse3 (unsigned int) __attribute__((noinline));
+uint64 llReverse1 (uint64) __attribute__((noinline));
+uint64 llReverse2 (uint64) __attribute__((noinline));
+unsigned long long llReverse3 (unsigned long long) __attribute__((noinline));
+
+uint32 Reverse1 (uint32 x) {
+  return (x<<24) | ((x<<8) & 0x00ff0000) | ((x>>8) & 0x0000ff00) | (x>>24);
+}
+uint32 Reverse2 (uint32 x) {
+  return ((x<<24) & 0xff000000) | ((x<<8) & 0x00ff0000) | ((x>>8) & 0x0000ff00) | ((x>>24) & 0x000000ff);
+}
+unsigned int Reverse3 (unsigned int x) {
+  return ((x & 0x0000ff00) <<8) | ((x & 0x00ff0000) >> 8) | ((x & 0xff000000) >> 24) | ((x & 0x000000ff) << 24);
+}
+
+uint64 llReverse1 (uint64 x) {
+  return ((x&0xFF00000000000000ull)>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) | ((x&0x000000FF00000000ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | ((x&0x00000000000000FFull)<<56);
+}
+uint64 llReverse2 (uint64 x) {
+  return (x>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) | ((x&0x000000FF00000000ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | (x<<56);
+}
+unsigned long long llReverse3 (unsigned long long x) {
+  return ((x<<40)&0x00FF000000000000ull) | ((x<<24)&0x0000FF0000000000ull) 
+	| ((x>>8)&0x00000000FF000000ull) | ((x>>24)&0x0000000000FF0000ull) |  ((x<<56)&0xFF00000000000000ull) | ((x<<8)&0x000000FF00000000ull) 
+        | ((x>>40)&0x000000000000FF00ull) | ((x>>56)&0x00000000000000FFull);
+}
+
+int main() {
+  unsigned int x = 0x12345678;
+  unsigned long long y = 0x123456789abcdef0ull;
+  if (Reverse1(x) != 0x78563412)
+    abort();
+  if (Reverse2(x) != 0x78563412)
+    abort();
+  if (Reverse3(x) != 0x78563412)
+    abort();
+  if (llReverse1(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llReverse2(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llReverse3(y) != 0xf0debc9a78563412ull)
+    abort();
+  return 0;
+}
+/* The capital R's throughout are so these match only instructions: */
+/* { dg-final { if [ istarget arm*-*-darwin* ] { global compiler_flags; if [string match "*-march=armv6*" $compiler_flags] { scan-assembler-times "\\\trev" 9 } } } } */
+/* { dg-final { if [ istarget i?86-*-darwin* ] { global compiler_flags; if ![string match "*-m64 *" $compiler_flags] { scan-assembler-times "\\\tbswap" 3 } } } } */
+/* { dg-final { if [ istarget i?86-*-darwin* ] { global compiler_flags; if [string match "*-m64 *" $compiler_flags] { scan-assembler-times "\\\tbswap" 6 } } } } */
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,69 @@
+/* APPLE LOCAL file bswap support */
+/* These cases should NOT generate bswap. */
+/* { dg-do compile } */
+/* { dg-options "-O1 -std=gnu99" } */
+
+typedef unsigned int uint32;
+typedef unsigned long long uint64;
+extern void abort(void);
+uint32 f (uint32) __attribute__((noinline));
+uint64 llf (uint64) __attribute__((noinline));
+unsigned int Reverse4 (volatile unsigned int) __attribute__((noinline));
+uint32 Reverse5 (uint32) __attribute__((noinline));
+unsigned int Reverse6 (unsigned int) __attribute__((noinline));
+uint64 llReverse4 (volatile uint64) __attribute__((noinline));
+unsigned long long llReverse5 (unsigned long long) __attribute__((noinline));
+uint64 llReverse6 (uint64) __attribute__((noinline));
+
+static int count = 0;
+static int llcount = 0; 
+uint32 f(uint32 x) { count++; return x; }
+uint64 llf(uint64 x) { llcount++; return x; }
+
+unsigned int Reverse4 (volatile unsigned int x) {   /* does NOT produce Rev */
+  return ((x & 0x0000ff00) <<8) | ((x & 0x00ff0000) >> 8) | ((x & 0xff000000) >> 24) | ((x & 0x000000ff) << 24);
+}
+uint32 Reverse5 (uint32 x) {    /* does NOT produce Rev */
+  return ((f(x) & 0x0000ff00) <<8) | ((f(x) & 0x00ff0000) >> 8) | ((f(x) & 0xff000000) >> 24) | ((f(x) & 0x000000ff) << 24);
+}
+unsigned int Reverse6 (unsigned int x) {
+  return ((x & 0x0000ff00) <<8) | ((x & 0x0000ff00) >> 8) | ((x & 0xff000000) >> 24) | ((x & 0x000000ff) << 24);
+}
+
+uint64 llReverse4 (volatile uint64 x) {
+  return ((x&0xFF00000000000000ull)>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) | ((x&0x000000FF00000000ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | ((x&0x00000000000000FFull)<<56);
+}
+unsigned long long llReverse5 (unsigned long long x) {
+  return ((llf(x)&0xFF00000000000000ull)>>56) | ((llf(x)&0x00FF000000000000ull)>>40) | ((llf(x)&0x0000FF0000000000ull)>>24) | ((llf(x)&0x000000FF00000000ull)>> 8) 
+	| ((llf(x)&0x00000000FF000000ull)<< 8) | ((llf(x)&0x0000000000FF0000ull)<<24) | ((llf(x)&0x000000000000FF00ull)<<40) | ((llf(x)&0x00000000000000FFull)<<56);
+}
+uint64 llReverse6 (uint64 x) {
+  return ((x&0xFF00000000000000ull)>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) |  ((x&0x000000000000ff00ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | ((x&0x00000000000000FFull)<<56);
+}
+int main() {
+  unsigned int x = 0x12345678;
+  unsigned long long y = 0x123456789abcdef0ull;
+  if (Reverse4(x) != 0x78563412)
+    abort();
+  if (Reverse5(x) != 0x78563412)
+    abort();
+  if (count != 4)
+    abort();
+  if (Reverse6(x) != 0x78560056)
+    abort();
+  if (llReverse4(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llReverse5(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llcount != 8)
+    abort();
+  if (llReverse6(y) != 0xf0debc9a005634deull)
+    abort();
+  return 0;
+}
+
+/* { dg-final { if [ istarget arm*-*-darwin* ] { scan-assembler-not "\\\trev" } } } */
+/* { dg-final { if [ istarget i?86-*-darwin* ] { scan-assembler-not "\\\tbswap" } } } */
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,55 @@
+/* APPLE LOCAL file bswap support */
+/* { dg-do run } */
+/* { dg-options "-O2 -std=gnu99" } */
+
+extern void abort(void);
+typedef unsigned int uint32;
+typedef unsigned long long uint64;
+uint32 Reverse1 (uint32) __attribute__((noinline));
+uint32 Reverse2 (uint32) __attribute__((noinline));
+unsigned int Reverse3 (unsigned int) __attribute__((noinline));
+uint64 llReverse1 (uint64) __attribute__((noinline));
+uint64 llReverse2 (uint64) __attribute__((noinline));
+unsigned long long llReverse3 (unsigned long long) __attribute__((noinline));
+
+uint32 Reverse1 (uint32 x) {
+  return (x<<24) | ((x<<8) & 0x00ff0000) | ((x>>8) & 0x0000ff00) | (x>>24);
+}
+uint32 Reverse2 (uint32 x) {
+  return ((x<<24) & 0xff000000) | ((x<<8) & 0x00ff0000) | ((x>>8) & 0x0000ff00) | ((x>>24) & 0x000000ff);
+}
+unsigned int Reverse3 (unsigned int x) {
+  return ((x & 0x0000ff00) <<8) | ((x & 0x00ff0000) >> 8) | ((x & 0xff000000) >> 24) | ((x & 0x000000ff) << 24);
+}
+
+uint64 llReverse1 (uint64 x) {
+  return ((x&0xFF00000000000000ull)>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) | ((x&0x000000FF00000000ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | ((x&0x00000000000000FFull)<<56);
+}
+uint64 llReverse2 (uint64 x) {
+  return (x>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) | ((x&0x000000FF00000000ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | (x<<56);
+}
+unsigned long long llReverse3 (unsigned long long x) {
+  return ((x<<40)&0x00FF000000000000ull) | ((x<<24)&0x0000FF0000000000ull) 
+	| ((x>>8)&0x00000000FF000000ull) | ((x>>24)&0x0000000000FF0000ull) |  ((x<<56)&0xFF00000000000000ull) | ((x<<8)&0x000000FF00000000ull) 
+        | ((x>>40)&0x000000000000FF00ull) | ((x>>56)&0x00000000000000FFull);
+}
+
+int main() {
+  unsigned int x = 0x12345678;
+  unsigned long long y = 0x123456789abcdef0ull;
+  if (Reverse1(x) != 0x78563412)
+    abort();
+  if (Reverse2(x) != 0x78563412)
+    abort();
+  if (Reverse3(x) != 0x78563412)
+    abort();
+  if (llReverse1(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llReverse2(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llReverse3(y) != 0xf0debc9a78563412ull)
+    abort();
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,65 @@
+/* APPLE LOCAL file bswap support */
+/* These cases should NOT generate bswap. */
+/* { dg-do run } */
+/* { dg-options "-O2 -std=gnu99" } */
+
+typedef unsigned int uint32;
+typedef unsigned long long uint64;
+extern void abort(void);
+uint32 f (uint32) __attribute__((noinline));
+uint64 llf (uint64) __attribute__((noinline));
+unsigned int Reverse4 (volatile unsigned int) __attribute__((noinline));
+uint32 Reverse5 (uint32) __attribute__((noinline));
+unsigned int Reverse6 (unsigned int) __attribute__((noinline));
+uint64 llReverse4 (volatile uint64) __attribute__((noinline));
+unsigned long long llReverse5 (unsigned long long) __attribute__((noinline));
+uint64 llReverse6 (uint64) __attribute__((noinline));
+
+static int count = 0;
+static int llcount = 0; 
+uint32 f(uint32 x) { count++; return x; }
+uint64 llf(uint64 x) { llcount++; return x; }
+
+unsigned int Reverse4 (volatile unsigned int x) {   /* does NOT produce Rev */
+  return ((x & 0x0000ff00) <<8) | ((x & 0x00ff0000) >> 8) | ((x & 0xff000000) >> 24) | ((x & 0x000000ff) << 24);
+}
+uint32 Reverse5 (uint32 x) {    /* does NOT produce Rev */
+  return ((f(x) & 0x0000ff00) <<8) | ((f(x) & 0x00ff0000) >> 8) | ((f(x) & 0xff000000) >> 24) | ((f(x) & 0x000000ff) << 24);
+}
+unsigned int Reverse6 (unsigned int x) {
+  return ((x & 0x0000ff00) <<8) | ((x & 0x0000ff00) >> 8) | ((x & 0xff000000) >> 24) | ((x & 0x000000ff) << 24);
+}
+
+uint64 llReverse4 (volatile uint64 x) {
+  return ((x&0xFF00000000000000ull)>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) | ((x&0x000000FF00000000ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | ((x&0x00000000000000FFull)<<56);
+}
+unsigned long long llReverse5 (unsigned long long x) {
+  return ((llf(x)&0xFF00000000000000ull)>>56) | ((llf(x)&0x00FF000000000000ull)>>40) | ((llf(x)&0x0000FF0000000000ull)>>24) | ((llf(x)&0x000000FF00000000ull)>> 8) 
+	| ((llf(x)&0x00000000FF000000ull)<< 8) | ((llf(x)&0x0000000000FF0000ull)<<24) | ((llf(x)&0x000000000000FF00ull)<<40) | ((llf(x)&0x00000000000000FFull)<<56);
+}
+uint64 llReverse6 (uint64 x) {
+  return ((x&0xFF00000000000000ull)>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) |  ((x&0x000000000000ff00ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | ((x&0x00000000000000FFull)<<56);
+}
+int main() {
+  unsigned int x = 0x12345678;
+  unsigned long long y = 0x123456789abcdef0ull;
+  if (Reverse4(x) != 0x78563412)
+    abort();
+  if (Reverse5(x) != 0x78563412)
+    abort();
+  if (count != 4)
+    abort();
+  if (Reverse6(x) != 0x78560056)
+    abort();
+  if (llReverse4(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llReverse5(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llcount != 8)
+    abort();
+  if (llReverse6(y) != 0xf0debc9a005634deull)
+    abort();
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,69 @@
+/* APPLE LOCAL file bswap support */
+/* These cases should NOT generate bswap. */
+/* { dg-do compile } */
+/* { dg-options "-O0 -std=gnu99" } */
+
+typedef unsigned int uint32;
+typedef unsigned long long uint64;
+extern void abort(void);
+uint32 f (uint32) __attribute__((noinline));
+uint64 llf (uint64) __attribute__((noinline));
+unsigned int Reverse4 (volatile unsigned int) __attribute__((noinline));
+uint32 Reverse5 (uint32) __attribute__((noinline));
+unsigned int Reverse6 (unsigned int) __attribute__((noinline));
+uint64 llReverse4 (volatile uint64) __attribute__((noinline));
+unsigned long long llReverse5 (unsigned long long) __attribute__((noinline));
+uint64 llReverse6 (uint64) __attribute__((noinline));
+
+static int count = 0;
+static int llcount = 0; 
+uint32 f(uint32 x) { count++; return x; }
+uint64 llf(uint64 x) { llcount++; return x; }
+
+unsigned int Reverse4 (volatile unsigned int x) {   /* does NOT produce Rev */
+  return ((x & 0x0000ff00) <<8) | ((x & 0x00ff0000) >> 8) | ((x & 0xff000000) >> 24) | ((x & 0x000000ff) << 24);
+}
+uint32 Reverse5 (uint32 x) {    /* does NOT produce Rev */
+  return ((f(x) & 0x0000ff00) <<8) | ((f(x) & 0x00ff0000) >> 8) | ((f(x) & 0xff000000) >> 24) | ((f(x) & 0x000000ff) << 24);
+}
+unsigned int Reverse6 (unsigned int x) {
+  return ((x & 0x0000ff00) <<8) | ((x & 0x0000ff00) >> 8) | ((x & 0xff000000) >> 24) | ((x & 0x000000ff) << 24);
+}
+
+uint64 llReverse4 (volatile uint64 x) {
+  return ((x&0xFF00000000000000ull)>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) | ((x&0x000000FF00000000ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | ((x&0x00000000000000FFull)<<56);
+}
+unsigned long long llReverse5 (unsigned long long x) {
+  return ((llf(x)&0xFF00000000000000ull)>>56) | ((llf(x)&0x00FF000000000000ull)>>40) | ((llf(x)&0x0000FF0000000000ull)>>24) | ((llf(x)&0x000000FF00000000ull)>> 8) 
+	| ((llf(x)&0x00000000FF000000ull)<< 8) | ((llf(x)&0x0000000000FF0000ull)<<24) | ((llf(x)&0x000000000000FF00ull)<<40) | ((llf(x)&0x00000000000000FFull)<<56);
+}
+uint64 llReverse6 (uint64 x) {
+  return ((x&0xFF00000000000000ull)>>56) | ((x&0x00FF000000000000ull)>>40) | ((x&0x0000FF0000000000ull)>>24) |  ((x&0x000000000000ff00ull)>> 8) 
+	| ((x&0x00000000FF000000ull)<< 8) | ((x&0x0000000000FF0000ull)<<24) | ((x&0x000000000000FF00ull)<<40) | ((x&0x00000000000000FFull)<<56);
+}
+int main() {
+  unsigned int x = 0x12345678;
+  unsigned long long y = 0x123456789abcdef0ull;
+  if (Reverse4(x) != 0x78563412)
+    abort();
+  if (Reverse5(x) != 0x78563412)
+    abort();
+  if (count != 4)
+    abort();
+  if (Reverse6(x) != 0x78560056)
+    abort();
+  if (llReverse4(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llReverse5(y) != 0xf0debc9a78563412ull)
+    abort();
+  if (llcount != 8)
+    abort();
+  if (llReverse6(y) != 0xf0debc9a005634deull)
+    abort();
+  return 0;
+}
+
+/* { dg-final { if [ istarget arm*-*-darwin* ] { scan-assembler-not "\\\trev" } } } */
+/* { dg-final { if [ istarget i?86-*-darwin* ] { scan-assembler-not "\\\tbswap" } } } */
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,33 @@
+/* APPLE LOCAL file ARM 5814138 */
+/* Sequential if statements were being translated into conditionally-
+   executed instructions with an incorrect condition.  */
+/* { dg-do run } */
+/* { dg-options "-O2" } */
+int bug (int n1, int n2, int *d1, int *d2)
+{
+    int flag = 0, test, x, x1, x2;
+
+    while (n1 != 0 && n2 != 0)
+    {
+	x1 = *d1, x2 = *d2;
+	test = x1 - x2;
+	if (test >= 0)
+	    x = x2, d2++, n2--, flag ^= 2;
+	if (test <= 0)
+	    x = x1, d1++, n1--, flag ^= 1;
+	if (flag == 3)
+	    return 1;
+    }
+
+    return 0;
+}
+
+int arr1[5] = {1, 2, 3, 4, 5};
+int arr2[5] = {0, -1, -2, -3, -4};
+int arr3[5] = {7, 8, 9, 10, 11};
+
+int main (void)
+{
+  return bug (5, 5, arr1, arr2) || bug (5, 5, arr1, arr3);
+}
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,13 @@
+/* APPLE LOCAL file radar 6068877 */
+/* Test that utf16 characters in a cfstring literal is supported in c, as well as
+   objc. */
+/* { dg-options "-Werror" } */
+/* { dg-do compile { target *-*-darwin* } } */
+
+#import 
+
+int main()
+{
+	CFSTR("h?? h?? h??");
+}
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,21 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that the correct builtin definition is generated when
+   -miphoneos-version-min is given.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1.3" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 10300)
+#error TEST FAILS
+#endif
+
+#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#error TEST FAILS
+#endif
+
+int main(void)
+{
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,21 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that the correct builtin definition is generated when
+   -miphoneos-version-min is given.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1.20" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 12000)
+#error TEST FAILS
+#endif
+
+#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#error TEST FAILS
+#endif
+
+int main(void)
+{
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,21 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that the correct builtin definition is generated when
+   -miphoneos-version-min is given.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1.2.3" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 10203)
+#error TEST FAILS
+#endif
+
+#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#error TEST FAILS
+#endif
+
+int main(void)
+{
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,21 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that the correct builtin definition is generated when
+   -miphoneos-version-min is given.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=98.76.54" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 987654)
+#error TEST FAILS
+#endif
+
+#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#error TEST FAILS
+#endif
+
+int main(void)
+{
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,20 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that the correct builtin definition is generated by default
+   when generating code for the ARM architecture.  */
+
+/* { dg-do compile { target arm*-*-darwin* } } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 20000)
+#error TEST FAILS
+#endif
+
+#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+#error TEST FAILS
+#endif
+
+int main(void)
+{
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that the correct builtin definition is generated by default
+   when generating code for the ARM architecture.  */
+
+/* { dg-do compile { target powerpc*-*-darwin* i?86-*-darwin* } } */
+
+#ifdef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__
+#error TEST FAILS
+#endif
+
+int main(void)
+{
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,14 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that -miphoneos-version-min is not allowed in conjunction with
+   -mmacosx-version-min.  */
+
+/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1.2 -mmacosx-version-min=10.4" } */
+
+int main(void)
+{
+  return 0;
+}
+
+/* { dg-error "-mmacosx-version-min not allowed with -miphoneos-version-min" "" {target *-*-*} 1 } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that an error message is given for an invalid
+   -miphoneos-version-min argument.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+int main(void)
+{
+  return 0;
+}
+
+/* { dg-error "Unknown value '1' of -miphoneos-version-min" "" {target *-*-* } 0 } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that an error message is given for an invalid
+   -miphoneos-version-min argument.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=foobar" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+int main(void)
+{
+  return 0;
+}
+
+/* { dg-error "Unknown value 'foobar' of -miphoneos-version-min" "" {target *-*-* } 0 } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that an error message is given for an invalid
+   -miphoneos-version-min argument.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1.2." } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+int main(void)
+{
+  return 0;
+}
+
+/* { dg-error "Unknown value '1.2.' of -miphoneos-version-min" "" {target *-*-* } 0 } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that an error message is given for an invalid
+   -miphoneos-version-min argument.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1.2.345" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+int main(void)
+{
+  return 0;
+}
+
+/* { dg-error "Unknown value '1.2.345' of -miphoneos-version-min" "" {target *-*-* } 0 } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that an error message is given for an invalid
+   -miphoneos-version-min argument.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1.f" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+int main(void)
+{
+  return 0;
+}
+
+/* { dg-error "Unknown value '1.f' of -miphoneos-version-min" "" {target *-*-* } 0 } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that an error message is given for an invalid
+   -miphoneos-version-min argument.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=1.2.f" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+int main(void)
+{
+  return 0;
+}
+
+/* { dg-error "Unknown value '1.2.f' of -miphoneos-version-min" "" {target *-*-* } 0 } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 5683689 */
+
+/* Verify that an error message is given for an invalid
+   -miphoneos-version-min argument.  */
+
+/* { dg-do compile { target arm*-*-darwin* i?86*-*-darwin* } } */
+/* { dg-options "-miphoneos-version-min=" } */
+/* { dg-skip-if "Not valid with -mmacosx-version-min" { *-*-darwin* } { "-mmacosx-version-min=*" } { "" } } */
+
+int main(void)
+{
+  return 0;
+}
+
+/* { dg-error "missing argument" "" {target *-*-* } 0 } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,27 @@
+/* APPLE LOCAL file shorten-64-to-32 5909621 4604239 */
+/* { dg-do compile } */
+/* { dg-options "-Wshorten-64-to-32" } */
+/* Radar 4604239 */
+
+#include 
+
+double f;
+int e;
+
+typedef double CFTimeInterval;
+typedef CFTimeInterval CFAbsoluteTime;
+
+double foo(void) { return cos(0.); }
+
+int main(int argc, const char *argv[])
+{
+  CFAbsoluteTime absoluteTime = CFAbsoluteTimeGetCurrent();
+  CFAbsoluteTime divisor = 2.0;
+  CFAbsoluteTime theRemainder = remainder(absoluteTime, divisor);
+  return 0;
+
+  f = pow (f, f);
+  f = fma (f, f, f);
+  f = frexp ( f, &e);
+  f = remquo (f, f, &e);
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file shorten-64-to-32 5909621 */
+/* { dg-do compile } */
+/* { dg-options "-Wshorten-64-to-32" } */
+/* Radar 5909621 */
+
+#include 
+#include 
+
+long long int i;
+
+int main (int argc, const char * argv[]) {
+  double value = 123.45;
+  i = llround(value);
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,12 @@
+/* APPLE LOCAL file stack-protector default 5095227 */
+/* { dg-do compile } */
+/* Verify that -fstack-protector is on by default and that it at least
+   appears to work.  */
+extern void f2(char *);
+void f1(void)
+{
+  char array[256];
+  f2(array);
+}
+/* { dg-final { scan-assembler "__stack_chk_guard" } } */
+/* { dg-final { scan-assembler "__stack_chk_fail" } } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,10 @@
+/* APPLE LOCAL file 5782111 */
+/* Identifiers containing UCNs should be prefixed with an underscore,
+   like other symbols.  */
+/* { dg-do compile { target *-*-darwin* } } */
+/* { dg-options "-std=c99" } */
+
+int foobar\u00C0;
+
+/* { dg-final { scan-assembler "_foobar" } } */
+/* { dg-final { scan-assembler-not "\[^_\]foobar" } } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,7 @@
+???/* APPLE LOCAL file UTF-8 BOM 5774975 */
+#include 
+
+int main (int argc, const char * argv[]) {
+  printf("Hello, World!\n");
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,43 @@
+/* APPLE LOCAL file uxtb16 support */
+/* { dg-do compile { target arm*-*-darwin* } } */
+/* { dg-options "-O2 -mno-thumb -march=armv6" } */
+/* Each function here should produce uxtb16. */
+
+/* uxtb16 x
+ 2, 0 */
+unsigned test1(unsigned x) { return x & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) | ((x & 0x0000FF00) >> 8); }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) | ((x >> 8) & 0x000000FF); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) | ((x & 0x000000FF) << 16); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) | ((x << 16) & 0x00FF0000); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) | ((x & 0xFF000000) >> 24); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) | ((x << 8) & 0x00FF0000); }
+
+/* { dg-final { scan-assembler-times "uxtb16" 9 } } */
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,64 @@
+/* APPLE LOCAL file uxtb16 support */
+/* { dg-do run { target arm*-*-darwin* } } */
+/* { dg-options "-O2 -mno-thumb -march=armv6" } */
+/* Make sure the uxtb16 sequences work. */
+
+/* uxtb16 x
+ 2, 0 */
+unsigned test1(unsigned x) { return x & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) | ((x & 0x0000FF00) >> 8); }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) | ((x >> 8) & 0x000000FF); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) | ((x & 0x000000FF) << 16); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) | ((x << 16) & 0x00FF0000); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) | ((x & 0xFF000000) >> 24); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) | ((x << 8) & 0x00FF0000); }
+
+int main() {
+    if (test1(0x12345678u) != 0x00340078u)
+      return 1;
+    if (test2(0x12345678u) != 0x00120056u)
+      return 1;
+    if (test3(0x12345678u) != 0x00120056u)
+      return 1;
+    if (test4(0x12345678u) != 0x00120056u)
+      return 1;
+    if (test5(0x12345678u) != 0x00120056u)
+      return 1;
+    if (test6(0x12345678u) != 0x00780034u)
+      return 1;
+    if (test7(0x12345678u) != 0x00780034u)
+      return 1;
+    if (test8(0x12345678u) != 0x00560012u)
+      return 1;
+    if (test9(0x12345678u) != 0x00560012u)
+      return 1;
+    return 0;
+}
+    
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,43 @@
+/* APPLE LOCAL file uxtb16 support */
+/* { dg-do compile { target arm*-*-darwin* } } */
+/* { dg-options "-O2 -mthumb -march=armv6" } */
+/* uxtb16 should not be generated with -mthumb. */
+
+/* uxtb16 x
+ 2, 0 */
+unsigned test1(unsigned x) { return x & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) | ((x & 0x0000FF00) >> 8); }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) | ((x >> 8) & 0x000000FF); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) | ((x & 0x000000FF) << 16); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) | ((x << 16) & 0x00FF0000); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) | ((x & 0xFF000000) >> 24); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) | ((x << 8) & 0x00FF0000); }
+
+/* { dg-final { scan-assembler-not "uxtb16" } } */
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,43 @@
+/* APPLE LOCAL file uxtb16 support */
+/* { dg-do compile { target arm*-*-darwin* } } */
+/* { dg-options "-O2 -mno-thumb -march=armv4t" } */
+/* uxtb16 should not be generated with -march=armv4t. */
+
+/* uxtb16 x
+ 2, 0 */
+unsigned test1(unsigned x) { return x & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) | ((x & 0x0000FF00) >> 8); }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) | ((x >> 8) & 0x000000FF); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) | ((x & 0x000000FF) << 16); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) | ((x << 16) & 0x00FF0000); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) | ((x & 0xFF000000) >> 24); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) | ((x << 8) & 0x00FF0000); }
+
+/* { dg-final { scan-assembler-not "uxtb16" } } */
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,65 @@
+/* APPLE LOCAL file uxtb16 support */
+/* { dg-do run { target arm*-*-darwin* } } */
+/* { dg-options "-O0 -mno-thumb -march=armv6" } */
+/* Make sure things work at -O0; some of these will produce
+   uxtb16, some will not. */
+
+/* uxtb16 x
+ 2, 0 */
+unsigned test1(unsigned x) { return x & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) | ((x & 0x0000FF00) >> 8); }
+
+/* uxtb16 x, ror #8
+ 3, 1 */
+unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) | ((x >> 8) & 0x000000FF); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) | ((x & 0x000000FF) << 16); }
+
+/* uxtb16 x, ror #16
+ 0, 2 */
+unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) | ((x << 16) & 0x00FF0000); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) | ((x & 0xFF000000) >> 24); }
+
+/* uxtb16 x, ror #24
+ 1, 3 */
+unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) | ((x << 8) & 0x00FF0000); }
+
+int main() {
+    if (test1(0x12345678u) != 0x00340078u)
+      return 1;
+    if (test2(0x12345678u) != 0x00120056u)
+      return 1;
+    if (test3(0x12345678u) != 0x00120056u)
+      return 1;
+    if (test4(0x12345678u) != 0x00120056u)
+      return 1;
+    if (test5(0x12345678u) != 0x00120056u)
+      return 1;
+    if (test6(0x12345678u) != 0x00780034u)
+      return 1;
+    if (test7(0x12345678u) != 0x00780034u)
+      return 1;
+    if (test8(0x12345678u) != 0x00560012u)
+      return 1;
+    if (test9(0x12345678u) != 0x00560012u)
+      return 1;
+    return 0;
+}
+    
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c?rev=54499&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c Thu Aug  7 20:03:11 2008
@@ -0,0 +1,16 @@
+/* APPLE LOCAL file ARM 6077274 */
+/* { dg-do compile { target arm*-*-darwin* } } */
+/* { dg-options "-fvisibility=hidden" } */
+/* { dg-final { scan-assembler "_bar\\\$non_lazy_ptr" } } */
+void foo (void (*fnptr) (void));
+
+void bar (void) __attribute__((weak));
+void bar (void)
+{
+}
+
+void baz (void)
+{
+  foo (bar);
+}
+




From isanbard at gmail.com  Thu Aug  7 20:04:03 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 01:04:03 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54500 - in
 /llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple: const-cfstring-5.C
 empty-destructor-stmt-seq.C kext-stackprotect-1.C kext-stackprotect-2.C
 omit-destructor-call-scope.C omit-destructor-call.C thunks1.C thunks2.C
 thunks3.C thunks4.C visibility-2.C visibility-3.C weak-1.C
Message-ID: <200808080104.m7814460023135@zion.cs.uiuc.edu>

Author: void
Date: Thu Aug  7 20:04:03 2008
New Revision: 54500

URL: http://llvm.org/viewvc/llvm-project?rev=54500&view=rev
Log:
Add non-blocks tests. Blocks tests will come after a blocks support update.

Added:
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/const-cfstring-5.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/empty-destructor-stmt-seq.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-2.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks1.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks2.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks3.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks4.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-2.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-3.C
    llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/weak-1.C

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/const-cfstring-5.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/const-cfstring-5.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/const-cfstring-5.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/const-cfstring-5.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,12 @@
+/* APPLE LOCAL file radar 6068877 */
+/* Test that utf16 characters in a cfstring literal is supported in c++, as well as
+   objc, objc++. */
+/* { dg-options "-Werror" } */
+/* { dg-do compile { target *-*-darwin* } } */
+
+#import 
+
+int main()
+{
+	CFSTR("h?? h?? h??");
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/empty-destructor-stmt-seq.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/empty-destructor-stmt-seq.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/empty-destructor-stmt-seq.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/empty-destructor-stmt-seq.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,25 @@
+/* APPLE LOCAL file 5559195 */
+// { dg-do run }
+
+// Verify that an empty statement list does not cause the destructor to be
+// marked as trivial.
+
+int N = 1;
+
+class A {
+public:
+  ~A () {
+    N = 0;
+    {}
+  }
+};
+
+class B : public A {
+};
+
+int
+main ()
+{
+  { B b; }
+  return N;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/kext-stackprotect-1.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-1.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-1.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,11 @@
+/* APPLE LOCAL file stack-protector default 5095227 */
+/* { dg-do compile { target powerpc*-*-darwin* } } */
+/* { dg-options "-fapple-kext -mmacosx-version-min=10.6" } */
+extern void f2(char *);
+void f1(void)
+{
+  char array[256];
+  f2(array);
+}
+/* { dg-final { scan-assembler-not "__stack_chk_guard" } } */
+/* { dg-final { scan-assembler-not "__stack_chk_fail" } } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/kext-stackprotect-2.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-2.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-2.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,11 @@
+/* APPLE LOCAL file stack-protector default 5095227 */
+/* { dg-do compile { target i?86*-*-darwin* } } */
+/* { dg-options "-fapple-kext" } */
+extern void f2(char *);
+void f1(void)
+{
+  char array[256];
+  f2(array);
+}
+/* { dg-final { scan-assembler-not "__stack_chk_guard" } } */
+/* { dg-final { scan-assembler-not "__stack_chk_fail" } } */

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/omit-destructor-call-scope.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,36 @@
+/* APPLE LOCAL file 5559195 */
+// { dg-do compile }
+// { dg-final { scan-assembler-not "(\tcall|\tbl)\[ 	\]*__ZN6ClassAD1Ev" } }
+// { dg-final { scan-assembler "(\tcall|\tbl)\[ 	\]*__ZN6ClassBD1Ev" } }
+
+// Verify that implicit calls to empty destructors are omitted and implicit
+// calls to non-empty destructors are not omitted when instances fall out of
+// scope.
+
+int n;
+
+class ClassA {
+public:
+  // Empty destructor.  Should not be called when ClassA instance falls out
+  // of scope.
+  ~ClassA() {}
+};
+
+class ClassB {
+public:
+  // Non-empty destructor.  Should be called when ClassB instance falls out
+  // of scope.
+  ~ClassB() {
+    n = 0;
+  }
+};
+
+int
+main() {
+  n = 1;
+  {
+    ClassA a; // Destructor not called.
+    ClassB b; // Destructor called.
+  }
+  return n;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/omit-destructor-call.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,19 @@
+/* APPLE LOCAL file 5559195 */
+// { dg-do compile }
+// { dg-final { scan-assembler-not "(\tcall|\tbl)\[ 	\]*__ZN6ClassAD2Ev" } }
+
+// Verify that implicit calls to empty destructors are omitted.
+
+class ClassA {
+public:
+  ~ClassA() {} // Empty destructor.  Should not be called by B's destructor.
+};
+
+class ClassB : public ClassA {
+};
+
+int
+main() {
+  { ClassB b; } // Destructor called as b falls out of scope.
+  return 0;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/thunks1.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks1.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks1.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,31 @@
+/* APPLE LOCAL file 5920116 */
+/* Test proper generation of weak virtual function thunks.  */
+/* { dg-do run  } */
+
+int result = 101;
+
+struct Interface1
+{
+  int if1_var;
+  virtual void Interface1Func(void) = 0;
+};
+
+struct Interface2
+{
+  virtual void Interface2Func(void) = 0;
+};
+
+class Implementation : public Interface1, public Interface2
+{
+  void Interface1Func(void) { result -= 1; }
+  void Interface2Func(void) { result -= 100; }
+};
+
+int main (void)
+{
+  Implementation *o2 = new Implementation;
+  ((Interface1 *) o2)->Interface1Func();
+  ((Interface2 *) o2)->Interface2Func();
+  delete o2;
+  return result;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/thunks2.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks2.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks2.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,32 @@
+/* APPLE LOCAL file 5920116 */
+/* Test proper generation of weak virtual function thunks.  */
+/* { dg-do run  } */
+/* { dg-options "-mdynamic-no-pic" } */
+
+int result = 101;
+
+struct Interface1
+{
+  int if1_var;
+  virtual void Interface1Func(void) = 0;
+};
+
+struct Interface2
+{
+  virtual void Interface2Func(void) = 0;
+};
+
+class Implementation : public Interface1, public Interface2
+{
+  void Interface1Func(void) { result -= 1; }
+  void Interface2Func(void) { result -= 100; }
+};
+
+int main (void)
+{
+  Implementation *o2 = new Implementation;
+  ((Interface1 *) o2)->Interface1Func();
+  ((Interface2 *) o2)->Interface2Func();
+  delete o2;
+  return result;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks3.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/thunks3.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks3.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks3.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,41 @@
+/* APPLE LOCAL file 5920116 */
+/* Test proper generation of non-weak virtual function thunks.  */
+/* { dg-do run  } */
+
+int result = 101;
+
+struct Interface1
+{
+  int if1_var;
+  virtual void Interface1Func(void) = 0;
+};
+
+struct Interface2
+{
+  virtual void Interface2Func(void) = 0;
+};
+
+class Implementation : public Interface1, public Interface2
+{
+  void Interface1Func(void);
+  void Interface2Func(void);
+};
+
+void Implementation::Interface1Func(void)
+{
+  result -= 1;
+}
+
+void Implementation::Interface2Func(void)
+{
+  result -= 100;
+}
+
+int main (void)
+{
+  Implementation *o2 = new Implementation;
+  ((Interface1 *) o2)->Interface1Func();
+  ((Interface2 *) o2)->Interface2Func();
+  delete o2;
+  return result;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks4.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/thunks4.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks4.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks4.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,42 @@
+/* APPLE LOCAL file 5920116 */
+/* Test proper generation of non-weak virtual function thunks.  */
+/* { dg-do run  } */
+/* { dg-options "-mdynamic-no-pic" } */
+
+int result = 101;
+
+struct Interface1
+{
+  int if1_var;
+  virtual void Interface1Func(void) = 0;
+};
+
+struct Interface2
+{
+  virtual void Interface2Func(void) = 0;
+};
+
+class Implementation : public Interface1, public Interface2
+{
+  void Interface1Func(void);
+  void Interface2Func(void);
+};
+
+void Implementation::Interface1Func(void)
+{
+  result -= 1;
+}
+
+void Implementation::Interface2Func(void)
+{
+  result -= 100;
+}
+
+int main (void)
+{
+  Implementation *o2 = new Implementation;
+  ((Interface1 *) o2)->Interface1Func();
+  ((Interface2 *) o2)->Interface2Func();
+  delete o2;
+  return result;
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-2.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/visibility-2.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-2.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-2.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,30 @@
+/* APPLE LOCAL file constrain visibility for templates 5813435 */
+/* { dg-require-visibility "" } */
+/* { dg-options "-fvisibility=hidden" } */
+
+/* { dg-final { scan-hidden "__ZN1s6vectorI1AEC1Ev" } } */
+/* { dg-final { scan-hidden "__ZN1s3fooI1AEEvT_" } } */
+/* Radar 5813435 */
+
+namespace s __attribute__((visibility("default"))) {
+  template 
+    class vector {
+  public:
+    vector() { }
+  };
+  template 
+    void foo(T t) {
+  }
+}
+
+class A {
+public:
+  A() { }
+};
+
+s::vector v;
+
+int main() {
+  A a;
+  s::foo(a);
+}

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-3.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/visibility-3.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-3.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-3.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,15 @@
+/* APPLE LOCAL file ARM 6062215 */
+/* { dg-do compile { target arm*-*-darwin* } } */
+/* { dg-options "-fvisibility-inlines-hidden" } */
+/* { dg-final { scan-assembler "__ZN8my_class2fnEv\\\$lazy_ptr" } } */
+
+struct my_class {
+  inline void fn (void) {}
+};
+
+void foo (void)
+{
+  my_class mci;
+  mci.fn ();
+}
+

Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/weak-1.C
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/weak-1.C?rev=54500&view=auto

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/weak-1.C (added)
+++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/weak-1.C Thu Aug  7 20:04:03 2008
@@ -0,0 +1,19 @@
+/* APPLE LOCAL file weak types 5954418 */
+/* { dg-do compile } */
+/* { dg-final { scan-assembler "weak_definition __ZTI1B" } } */
+/* { dg-final { scan-assembler "weak_definition __ZTI1A" } } */
+/* Radar 5954418 */
+
+#define WEAK __attribute__ ((weak)) 
+
+class WEAK A {
+  virtual void foo();
+};
+
+class B : public A {
+  virtual void foo();
+};
+
+void A::foo() { }
+
+void B::foo() { }




From dalej at apple.com  Thu Aug  7 22:35:04 2008
From: dalej at apple.com (Dale Johannesen)
Date: Fri, 08 Aug 2008 03:35:04 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54503 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Message-ID: <200808080335.m783Z5W8028007@zion.cs.uiuc.edu>

Author: johannes
Date: Thu Aug  7 22:35:02 2008
New Revision: 54503

URL: http://llvm.org/viewvc/llvm-project?rev=54503&view=rev
Log:
Fix a case where an initializer must add explicit
padding at the end of a struct (see commment).


Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54503&r1=54502&r2=54503&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Thu Aug  7 22:35:02 2008
@@ -6708,7 +6708,7 @@
 
     // Decode the field's value.
     Constant *Val = Convert(elt_value);
-   
+
     // If the field is a bitfield, it could be spread across multiple fields and
     // may start at some bit offset.
     if (isBitfield(Field)) {
@@ -6717,7 +6717,7 @@
       // If not, things are much simpler.
       unsigned int FieldNo = GetFieldIndex(Field);
       assert(FieldNo < ResultElts.size() && "Invalid struct field number!");
-     
+
       // Example: struct X { int A; char C[]; } x = { 4, "foo" };
       assert((TYPE_SIZE(getDeclaredType(Field)) ||
              (FieldNo == ResultElts.size()-1 &&
@@ -6751,7 +6751,34 @@
       ResultElts[i] = Constant::getNullValue(STy->getElementType(i));
   }
 
-  return ConstantStruct::get(ResultElts, STy->isPacked());
+  // The type we're going to build for the initializer is not necessarily the
+  // same as the type of the struct.  In cases where there is a union field.
+  // it is possible for the size and/or alignment of the two structs to differ,
+  // in which case we need some explicit padding.
+  Constant *retval = ConstantStruct::get(ResultElts, STy->isPacked());
+  const Type *NewSTy = retval->getType();
+
+  unsigned oldLLVMSize = getTargetData().getABITypeSize(STy);
+  unsigned oldLLVMAlign = getTargetData().getABITypeAlignment(STy);
+  oldLLVMSize = ((oldLLVMSize+oldLLVMAlign-1)/oldLLVMAlign)*oldLLVMAlign;
+
+  unsigned newLLVMSize = getTargetData().getABITypeSize(NewSTy);
+  unsigned newLLVMAlign = getTargetData().getABITypeAlignment(NewSTy);
+  newLLVMSize = ((newLLVMSize+newLLVMAlign-1)/newLLVMAlign)*newLLVMAlign;
+
+  // oldSize < newSize occurs legitimately when we don't know the size of
+  // the struct.
+  if (newLLVMSize < oldLLVMSize) {
+    const Type *FillTy;
+    if (oldLLVMSize - newLLVMSize == 1)
+      FillTy = Type::Int8Ty;
+    else
+      FillTy = ArrayType::get(Type::Int8Ty, oldLLVMSize - newLLVMSize);
+    ResultElts.push_back(Constant::getNullValue(FillTy));
+    retval = ConstantStruct::get(ResultElts, STy->isPacked());
+  }
+
+  return retval;
 }
 
 Constant *TreeConstantToLLVM::ConvertUnionCONSTRUCTOR(tree exp) {




From isanbard at gmail.com  Thu Aug  7 22:36:19 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 03:36:19 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54504 -
	/llvm-gcc-4.2/trunk/gcc/limitx.h
Message-ID: <200808080336.m783aKfo028051@zion.cs.uiuc.edu>

Author: void
Date: Thu Aug  7 22:36:19 2008
New Revision: 54504

URL: http://llvm.org/viewvc/llvm-project?rev=54504&view=rev
Log:
Linux systems have limits.h header files that don't work with the #include_next
in the built limits.h header. This is a minor hack to prevent it from erroring
out.

Modified:
    llvm-gcc-4.2/trunk/gcc/limitx.h

Modified: llvm-gcc-4.2/trunk/gcc/limitx.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/limitx.h?rev=54504&r1=54503&r2=54504&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/limitx.h (original)
+++ llvm-gcc-4.2/trunk/gcc/limitx.h Thu Aug  7 22:36:19 2008
@@ -7,6 +7,8 @@
 #include "syslimits.h"
 #endif
 #ifdef _GCC_NEXT_LIMITS_H
+/* LLVM LOCAL Fix for Linux builds */
+#define _GCC_LIMITS_H_
 #include_next 
 #undef _GCC_NEXT_LIMITS_H
 #endif




From dalej at apple.com  Thu Aug  7 22:37:11 2008
From: dalej at apple.com (Dale Johannesen)
Date: Fri, 08 Aug 2008 03:37:11 -0000
Subject: [llvm-commits] [llvm] r54505 - in /llvm/trunk/test/FrontendC:
 2008-08-07-AlignPadding1.c 2008-08-07-AlignPadding2.c
Message-ID: <200808080337.m783bBAW028086@zion.cs.uiuc.edu>

Author: johannes
Date: Thu Aug  7 22:37:11 2008
New Revision: 54505

URL: http://llvm.org/viewvc/llvm-project?rev=54505&view=rev
Log:
Testcases for 54503.  One derived from PR 2533, the
other from Python.


Added:
    llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c
    llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c

Added: llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c?rev=54505&view=auto

==============================================================================
--- llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c (added)
+++ llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c Thu Aug  7 22:37:11 2008
@@ -0,0 +1,29 @@
+/* RUN: %llvmgcc %s -m64 -S -o - -emit-llvm -O0 | grep zeroinitializer | count 6
+
+The FE must generate padding here both at the end of each PyG_Head and
+between array elements.  Reduced from Python. */
+
+typedef union _gc_head {
+  struct {
+    union _gc_head *gc_next;
+    union _gc_head *gc_prev;
+    long gc_refs;
+  } gc;
+  int dummy __attribute__((aligned(16)));
+} PyGC_Head;
+
+struct gc_generation {
+  PyGC_Head head;
+  int threshold;
+  int count;
+};
+
+#define GEN_HEAD(n) (&generations[n].head)
+
+/* linked lists of container objects */
+static struct gc_generation generations[3] = {
+        /* PyGC_Head,                           threshold,      count */
+        {{{GEN_HEAD(0), GEN_HEAD(0), 0}},       700,            0},
+        {{{GEN_HEAD(1), GEN_HEAD(1), 0}},       10,             0},
+        {{{GEN_HEAD(2), GEN_HEAD(2), 0}},       10,             0},
+};

Added: llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c?rev=54505&view=auto

==============================================================================
--- llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c (added)
+++ llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c Thu Aug  7 22:37:11 2008
@@ -0,0 +1,18 @@
+/* RUN: %llvmgcc %s -m64 -S -o - -emit-llvm -O0 | grep zeroinitializer | count 1
+
+The FE must not generate padding here between array elements.  PR 2533. */
+
+typedef struct {
+ const char *name;
+ int flags;
+ union {
+   int x;
+ } u;
+} OptionDef;
+
+const OptionDef options[] = {
+ /* main options */
+ { "a", 0, {3} },
+ { "b", 0, {4} },
+ { 0, },
+};




From bruno.cardoso at gmail.com  Thu Aug  7 22:58:35 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 03:58:35 -0000
Subject: [llvm-commits] [llvm] r54506 - in /llvm/trunk/test/CodeGen/Mips: ./
 2008-06-05-Carry.ll 2008-07-03-SRet.ll 2008-07-05-ByVal.ll dg.exp
Message-ID: <200808080358.m783wZ1c028756@zion.cs.uiuc.edu>

Author: bruno
Date: Thu Aug  7 22:58:34 2008
New Revision: 54506

URL: http://llvm.org/viewvc/llvm-project?rev=54506&view=rev
Log:
Batch 1 of Mips CodeGen tests, more coming...
I had a lot of simple local codegen tests and they are now ready to be placed
in test/CodeGen. 


Added:
    llvm/trunk/test/CodeGen/Mips/
    llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll
    llvm/trunk/test/CodeGen/Mips/dg.exp

Added: llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll?rev=54506&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll Thu Aug  7 22:58:34 2008
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: grep subu %t | count 2
+; RUN: grep addu %t | count 4
+
+target datalayout =
+"e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define i64 @add64(i64 %u, i64 %v) nounwind  {
+entry:
+	%tmp2 = add i64 %u, %v	
+  ret i64 %tmp2
+}
+
+define i64 @sub64(i64 %u, i64 %v) nounwind  {
+entry:
+  %tmp2 = sub i64 %u, %v
+  ret i64 %tmp2
+}

Added: llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll?rev=54506&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll Thu Aug  7 22:58:34 2008
@@ -0,0 +1,18 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips |  \
+; RUN:    grep {sw.*(\$4)} | count 3
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+	%struct.sret0 = type { i32, i32, i32 }
+
+define void @test0(%struct.sret0* noalias sret %agg.result, i32 %dummy) nounwind {
+entry:
+	getelementptr %struct.sret0* %agg.result, i32 0, i32 0		; :0 [#uses=1]
+	store i32 %dummy, i32* %0, align 4
+	getelementptr %struct.sret0* %agg.result, i32 0, i32 1		; :1 [#uses=1]
+	store i32 %dummy, i32* %1, align 4
+	getelementptr %struct.sret0* %agg.result, i32 0, i32 2		; :2 [#uses=1]
+	store i32 %dummy, i32* %2, align 4
+	ret void
+}
+

Added: llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll?rev=54506&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll Thu Aug  7 22:58:34 2008
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips |  \
+; RUN:    grep {lw.*(\$4)} | count 2
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+	%struct.byval0 = type { i32, i32 }
+
+define i64 @test0(%struct.byval0* byval  %b, i64 %sum) nounwind  {
+entry:
+	getelementptr %struct.byval0* %b, i32 0, i32 0		; :0 [#uses=1]
+	load i32* %0, align 4		; :1 [#uses=1]
+	getelementptr %struct.byval0* %b, i32 0, i32 1		; :2 [#uses=1]
+	load i32* %2, align 4		; :3 [#uses=1]
+	add i32 %3, %1		; :4 [#uses=1]
+	sext i32 %4 to i64		; :5 [#uses=1]
+	add i64 %5, %sum		; :6 [#uses=1]
+	ret i64 %6
+}
+

Added: llvm/trunk/test/CodeGen/Mips/dg.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/dg.exp?rev=54506&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/dg.exp (added)
+++ llvm/trunk/test/CodeGen/Mips/dg.exp Thu Aug  7 22:58:34 2008
@@ -0,0 +1,5 @@
+load_lib llvm.exp
+
+if { [llvm_supports_target Mips] } {
+  RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/*.{ll,c,cpp}]]
+}




From bruno.cardoso at gmail.com  Thu Aug  7 23:03:26 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 04:03:26 -0000
Subject: [llvm-commits] [llvm] r54507 - in /llvm/trunk/test/CodeGen/Mips:
 2008-07-06-fadd64.ll 2008-07-07-FPExtend.ll 2008-07-07-Float2Int.ll
Message-ID: <200808080403.m7843QVT028946@zion.cs.uiuc.edu>

Author: bruno
Date: Thu Aug  7 23:03:25 2008
New Revision: 54507

URL: http://llvm.org/viewvc/llvm-project?rev=54507&view=rev
Log:
Batch 2 of Mips CodeGen tests

Added:
    llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll

Added: llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll?rev=54507&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll Thu Aug  7 23:03:25 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
+; RUN: grep __adddf3
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define double @dofloat(double %a, double %b) nounwind {
+entry:
+	add double %a, %b		; :0 [#uses=1]
+	ret double %0
+}

Added: llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll?rev=54507&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll Thu Aug  7 23:03:25 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
+; RUN: grep __extendsfdf2
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define double @dofloat(float %a) nounwind {
+entry:
+	fpext float %a to double		; :0 [#uses=1]
+	ret double %0
+}

Added: llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll?rev=54507&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll Thu Aug  7 23:03:25 2008
@@ -0,0 +1,17 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
+; RUN: grep trunc.w.s | count 3
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define i32 @fptoint(float %a) nounwind {
+entry:
+	fptosi float %a to i32		; :0 [#uses=1]
+	ret i32 %0
+}
+
+define i32 @fptouint(float %a) nounwind {
+entry:
+	fptoui float %a to i32		; :0 [#uses=1]
+	ret i32 %0
+}




From bruno.cardoso at gmail.com  Thu Aug  7 23:05:51 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 04:05:51 -0000
Subject: [llvm-commits] [llvm] r54508 - in /llvm/trunk/test/CodeGen/Mips:
 2008-07-07-IntDoubleConvertions.ll 2008-07-15-InternalConstant.ll
 2008-07-15-SmallSection.ll
Message-ID: <200808080405.m7845qei029046@zion.cs.uiuc.edu>

Author: bruno
Date: Thu Aug  7 23:05:51 2008
New Revision: 54508

URL: http://llvm.org/viewvc/llvm-project?rev=54508&view=rev
Log:
Batch 3 of Mips CodeGen tests

Added:
    llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll

Added: llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll?rev=54508&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll Thu Aug  7 23:05:51 2008
@@ -0,0 +1,33 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: grep __floatsidf   %t | count 1
+; RUN: grep __floatunsidf %t | count 1
+; RUN: grep __fixdfsi %t | count 1
+; RUN: grep __fixunsdfsi %t  | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define double @int2fp(i32 %a) nounwind {
+entry:
+	sitofp i32 %a to double		; :0 [#uses=1]
+	ret double %0
+}
+
+define double @uint2double(i32 %a) nounwind {
+entry:
+	uitofp i32 %a to double		; :0 [#uses=1]
+	ret double %0
+}
+
+define i32 @double2int(double %a) nounwind {
+entry:
+  fptosi double %a to i32   ; :0 [#uses=1]
+  ret i32 %0
+}
+
+define i32 @double2uint(double %a) nounwind {
+entry:
+  fptoui double %a to i32   ; :0 [#uses=1]
+  ret i32 %0
+}
+

Added: llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll?rev=54508&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll Thu Aug  7 23:05:51 2008
@@ -0,0 +1,22 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t 
+; RUN: grep {rodata.str1.4,"aMS", at progbits}  %t | count 1
+; RUN: grep {r.data,}  %t | count 1
+; RUN: grep {\%hi} %t | count 2
+; RUN: grep {\%lo} %t | count 2
+; RUN: not grep {gp_rel} %t
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+ at .str = internal constant [10 x i8] c"AAAAAAAAA\00"
+ at i0 = internal constant [5 x i32] [ i32 0, i32 1, i32 2, i32 3, i32 4 ] 
+
+define i8* @foo() nounwind {
+entry:
+	ret i8* getelementptr ([10 x i8]* @.str, i32 0, i32 0)
+}
+
+define i32* @bar() nounwind  {
+entry:
+  ret i32* getelementptr ([5 x i32]* @i0, i32 0, i32 0)
+}
+

Added: llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll?rev=54508&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll Thu Aug  7 23:05:51 2008
@@ -0,0 +1,32 @@
+; RUN: llvm-as < %s | llc -mips-ssection-threshold=8 -march=mips -f -o %t0
+; RUN: llvm-as < %s | llc -mips-ssection-threshold=0 -march=mips -f -o %t1
+; RUN: grep {sdata} %t0 | count 1
+; RUN: grep {sbss} %t0 | count 1
+; RUN: grep {gp_rel} %t0 | count 2
+; RUN: not grep {sdata} %t1 
+; RUN: not grep {sbss} %t1 
+; RUN: not grep {gp_rel} %t1
+; RUN: grep {\%hi} %t1 | count 2
+; RUN: grep {\%lo} %t1 | count 2
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+  %struct.anon = type { i32, i32 }
+ at s0 = global [8 x i8] c"AAAAAAA\00", align 4
+ at foo = global %struct.anon { i32 2, i32 3 }
+ at bar = global %struct.anon zeroinitializer 
+
+define i8* @A0() nounwind {
+entry:
+	ret i8* getelementptr ([8 x i8]* @s0, i32 0, i32 0)
+}
+
+define i32 @A1() nounwind {
+entry:
+  load i32* getelementptr (%struct.anon* @foo, i32 0, i32 0), align 8 
+  load i32* getelementptr (%struct.anon* @foo, i32 0, i32 1), align 4 
+  add i32 %1, %0
+  ret i32 %2
+}
+




From bruno.cardoso at gmail.com  Thu Aug  7 23:08:30 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 04:08:30 -0000
Subject: [llvm-commits] [llvm] r54509 - in /llvm/trunk/test/CodeGen/Mips:
 2008-07-16-SignExtInReg.ll 2008-07-22-Cstpool.ll 2008-07-23-fpcmp.ll
Message-ID: <200808080408.m7848UXJ029129@zion.cs.uiuc.edu>

Author: bruno
Date: Thu Aug  7 23:08:30 2008
New Revision: 54509

URL: http://llvm.org/viewvc/llvm-project?rev=54509&view=rev
Log:
Batch 4 of Mips CodeGen tests

Added:
    llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll

Added: llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll?rev=54509&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll Thu Aug  7 23:08:30 2008
@@ -0,0 +1,19 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: grep seh %t | count 1
+; RUN: grep seb %t | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define i8 @A(i8 %e.0, i8 signext %sum) signext nounwind {
+entry:
+	add i8 %sum, %e.0		; :0 [#uses=1]
+	ret i8 %0
+}
+
+define i16 @B(i16 %e.0, i16 signext %sum) signext nounwind {
+entry:
+	add i16 %sum, %e.0		; :0 [#uses=1]
+	ret i16 %0
+}
+

Added: llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll?rev=54509&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll Thu Aug  7 23:08:30 2008
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t 
+; RUN: grep {CPI\[01\]_\[01\]:} %t | count 2
+; RUN: grep {rodata.cst4,"aM", at progbits} %t | count 1
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define float @F(float %a) nounwind {
+entry:
+	add float %a, 0x4011333340000000		; :0 [#uses=1]
+	add float %0, 0x4010666660000000		; :1 [#uses=1]
+	ret float %1
+}

Added: llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll?rev=54509&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll Thu Aug  7 23:08:30 2008
@@ -0,0 +1,34 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: grep {c\\..*\\.s} %t | count 3
+; RUN: grep {bc1\[tf\]} %t | count 3
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define float @A(float %a, float %b) nounwind {
+entry:
+	fcmp ogt float %a, 1.000000e+00		; :0 [#uses=1]
+	br i1 %0, label %bb, label %bb2
+
+bb:		; preds = %entry
+	add float %a, 1.000000e+00		; :1 [#uses=1]
+	ret float %1
+
+bb2:		; preds = %entry
+	ret float %b
+}
+
+define float @B(float %a, float %b) nounwind {
+entry:
+  fcmp ogt float %a, 1.000000e+00   ; :0 [#uses=1]
+  %.0 = select i1 %0, float %a, float %b    ;  [#uses=1]
+  ret float %.0
+}
+
+define i32 @C(i32 %a, i32 %b, float %j) nounwind {
+entry:
+  fcmp ogt float %j, 1.000000e+00   ; :0 [#uses=1]
+  %.0 = select i1 %0, i32 %a, i32 %b    ;  [#uses=1]
+  ret i32 %.0
+}
+




From bruno.cardoso at gmail.com  Thu Aug  7 23:09:57 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 04:09:57 -0000
Subject: [llvm-commits] [llvm] r54510 - in /llvm/trunk/test/CodeGen/Mips:
 2008-07-29-icmp.ll 2008-07-31-fcopysign.ll 2008-08-01-AsmInline.ll
Message-ID: <200808080409.m7849wM5029184@zion.cs.uiuc.edu>

Author: bruno
Date: Thu Aug  7 23:09:57 2008
New Revision: 54510

URL: http://llvm.org/viewvc/llvm-project?rev=54510&view=rev
Log:
Batch 5 of Mips CodeGen tests

Added:
    llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll
    llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll
    llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll

Added: llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll?rev=54510&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll Thu Aug  7 23:09:57 2008
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
+; RUN: grep {b\[ne\]\[eq\]} | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define float @A(float %a, float %b, i32 %j) nounwind {
+entry:
+	icmp sgt i32 %j, 1		; :0 [#uses=1]
+	%.0 = select i1 %0, float %a, float %b		;  [#uses=1]
+	ret float %.0
+}

Added: llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll?rev=54510&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll Thu Aug  7 23:09:57 2008
@@ -0,0 +1,14 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: grep abs.s  %t | count 1
+; RUN: grep neg.s %t | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define float @A(float %i, float %j) nounwind  {
+entry:
+	tail call float @copysignf( float %i, float %j ) nounwind readnone 		; :0 [#uses=1]
+	ret float %0
+}
+
+declare float @copysignf(float, float) nounwind readnone 

Added: llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll?rev=54510&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll Thu Aug  7 23:09:57 2008
@@ -0,0 +1,17 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t 
+; RUN: grep mfhi  %t | count 1
+; RUN: grep mflo  %t | count 1
+; RUN: grep multu %t | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+	%struct.DWstruct = type { i32, i32 }
+
+define i32 @A0(i32 %u, i32 %v) nounwind  {
+entry:
+	%asmtmp = tail call %struct.DWstruct asm "multu $2,$3", "={lo},={hi},d,d"( i32 %u, i32 %v ) nounwind
+	%asmresult = extractvalue %struct.DWstruct %asmtmp, 0
+	%asmresult1 = extractvalue %struct.DWstruct %asmtmp, 1		;  [#uses=1]
+  %res = add i32 %asmresult, %asmresult1
+	ret i32 %res
+}




From bruno.cardoso at gmail.com  Thu Aug  7 23:11:30 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 04:11:30 -0000
Subject: [llvm-commits] [llvm] r54511 - in /llvm/trunk/test/CodeGen/Mips:
 2008-08-03-ReturnDouble.ll 2008-08-03-fabs64.ll 2008-08-04-Bitconvert.ll
Message-ID: <200808080411.m784BV1f029243@zion.cs.uiuc.edu>

Author: bruno
Date: Thu Aug  7 23:11:30 2008
New Revision: 54511

URL: http://llvm.org/viewvc/llvm-project?rev=54511&view=rev
Log:
Batch 6 of Mips CodeGen tests

Added:
    llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll
    llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll
    llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll

Added: llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll?rev=54511&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll Thu Aug  7 23:11:30 2008
@@ -0,0 +1,18 @@
+; Double return in abicall (default)
+; RUN: llvm-as < %s | llc -march=mips
+; PR2615
+
+define double @main(...) {
+entry:
+        %retval = alloca double         ;  [#uses=3]
+        store double 0.000000e+00, double* %retval
+        %r = alloca double              ;  [#uses=1]
+        load double* %r         ; :0 [#uses=1]
+        store double %0, double* %retval
+        br label %return
+
+return:         ; preds = %entry
+        load double* %retval            ; :1 [#uses=1]
+        ret double %1
+}
+

Added: llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll?rev=54511&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll Thu Aug  7 23:11:30 2008
@@ -0,0 +1,16 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: grep {lui.*32767} %t | count 1
+; RUN: grep {ori.*65535} %t | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define double @A(double %c, double %d) nounwind readnone  {
+entry:
+	tail call double @fabs( double %c ) nounwind readnone 		; :0 [#uses=1]
+	tail call double @fabs( double %d ) nounwind readnone 		; :0 [#uses=1]
+  add double %0, %1
+  ret double %2
+}
+
+declare double @fabs(double) nounwind readnone 

Added: llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll?rev=54511&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll Thu Aug  7 23:11:30 2008
@@ -0,0 +1,18 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips -f -o %t
+; RUN: grep mtc1 %t | count 1
+; RUN: grep mfc1 %t | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define float @A(i32 %u) nounwind  {
+entry:
+	bitcast i32 %u to float
+	ret float %0
+}
+
+define i32 @B(float %u) nounwind  {
+entry:
+	bitcast float %u to i32
+	ret i32 %0
+}




From bruno.cardoso at gmail.com  Thu Aug  7 23:12:42 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 04:12:42 -0000
Subject: [llvm-commits] [llvm] r54512 - in /llvm/trunk/test/CodeGen/Mips:
 2008-08-06-Alloca.ll 2008-08-07-CC.ll 2008-08-07-FPRound.ll
Message-ID: <200808080412.m784CgVg029296@zion.cs.uiuc.edu>

Author: bruno
Date: Thu Aug  7 23:12:42 2008
New Revision: 54512

URL: http://llvm.org/viewvc/llvm-project?rev=54512&view=rev
Log:
[Last] Batch 7 of Mips CodeGen tests

Added:
    llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll
    llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll
    llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll

Added: llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll?rev=54512&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll Thu Aug  7 23:12:42 2008
@@ -0,0 +1,17 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
+; RUN: grep {subu.*sp} | count 2
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define i32 @twoalloca(i32 %size) nounwind {
+entry:
+	alloca i8, i32 %size		; :0 [#uses=1]
+	alloca i8, i32 %size		; :1 [#uses=1]
+	call i32 @foo( i8* %0 ) nounwind		; :2 [#uses=1]
+	call i32 @foo( i8* %1 ) nounwind		; :3 [#uses=1]
+	add i32 %3, %2		; :4 [#uses=1]
+	ret i32 %4
+}
+
+declare i32 @foo(i8*)

Added: llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll?rev=54512&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll Thu Aug  7 23:12:42 2008
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | llc -march=mips -f 
+; Mips must ignore fastcc
+
+target datalayout =
+"e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define internal fastcc i32 @A(i32 %u) nounwind  {
+entry:
+  ret i32 %u 
+}
+

Added: llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll?rev=54512&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll Thu Aug  7 23:12:42 2008
@@ -0,0 +1,11 @@
+; RUN: llvm-as < %s | llc -enable-legalize-types -march=mips | \
+; RUN: grep __truncdfsf2 | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define float @round2float(double %a) nounwind {
+entry:
+	fptrunc double %a to float		; :0 [#uses=1]
+	ret float %0
+}




From bruno.cardoso at gmail.com  Thu Aug  7 23:49:43 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 04:49:43 -0000
Subject: [llvm-commits] [llvm] r54514 -
	/llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp
Message-ID: <200808080449.m784nhJR030457@zion.cs.uiuc.edu>

Author: bruno
Date: Thu Aug  7 23:49:42 2008
New Revision: 54514

URL: http://llvm.org/viewvc/llvm-project?rev=54514&view=rev
Log:
Match raw "psp" triple target, as done by the homebrew toolchain.

Modified:
    llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp

Modified: llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp?rev=54514&r1=54513&r2=54514&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp Thu Aug  7 23:49:42 2008
@@ -50,7 +50,8 @@
   // a allegrex target, set the features. We also match
   // big and little endian allegrex cores (dont really
   // know if a big one exists)
-  if (TT.find("mipsallegrex") != std::string::npos) {
+  if (TT.find("mipsallegrex") != std::string::npos ||
+      TT.find("psp") != std::string::npos) {
     MipsABI = EABI;
     IsSingleFloat = true;
     MipsArchVersion = Mips2;




From sabre at nondot.org  Fri Aug  8 00:33:06 2008
From: sabre at nondot.org (Chris Lattner)
Date: Fri, 08 Aug 2008 05:33:06 -0000
Subject: [llvm-commits] [llvm] r54515 - in /llvm/trunk:
 include/llvm/PassAnalysisSupport.h include/llvm/PassManagers.h
 lib/VMCore/Pass.cpp lib/VMCore/PassManager.cpp
Message-ID: <200808080533.m785X6hY031799@zion.cs.uiuc.edu>

Author: lattner
Date: Fri Aug  8 00:33:04 2008
New Revision: 54515

URL: http://llvm.org/viewvc/llvm-project?rev=54515&view=rev
Log:
Speed up the passmgr by avoiding heap thrashing on vectors.

Modified:
    llvm/trunk/include/llvm/PassAnalysisSupport.h
    llvm/trunk/include/llvm/PassManagers.h
    llvm/trunk/lib/VMCore/Pass.cpp
    llvm/trunk/lib/VMCore/PassManager.cpp

Modified: llvm/trunk/include/llvm/PassAnalysisSupport.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassAnalysisSupport.h?rev=54515&r1=54514&r2=54515&view=diff

==============================================================================
--- llvm/trunk/include/llvm/PassAnalysisSupport.h (original)
+++ llvm/trunk/include/llvm/PassAnalysisSupport.h Fri Aug  8 00:33:04 2008
@@ -20,6 +20,7 @@
 #define LLVM_PASS_ANALYSIS_SUPPORT_H
 
 #include 
+#include "llvm/ADT/SmallVector.h"
 
 namespace llvm {
 
@@ -34,9 +35,14 @@
 // Pass infrastructure through the getAnalysisUsage virtual function.
 //
 class AnalysisUsage {
+public:
+  typedef SmallVector VectorType;
+
+private:
   // Sets of analyses required and preserved by a pass
-  std::vector Required, RequiredTransitive, Preserved;
+  VectorType Required, RequiredTransitive, Preserved;
   bool PreservesAll;
+
 public:
   AnalysisUsage() : PreservesAll(false) {}
 
@@ -95,11 +101,11 @@
   ///
   void setPreservesCFG();
 
-  const std::vector &getRequiredSet() const { return Required; }
-  const std::vector &getRequiredTransitiveSet() const {
+  const VectorType &getRequiredSet() const { return Required; }
+  const VectorType &getRequiredTransitiveSet() const {
     return RequiredTransitive;
   }
-  const std::vector &getPreservedSet() const { return Preserved; }
+  const VectorType &getPreservedSet() const { return Preserved; }
 };
 
 //===----------------------------------------------------------------------===//

Modified: llvm/trunk/include/llvm/PassManagers.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassManagers.h?rev=54515&r1=54514&r2=54515&view=diff

==============================================================================
--- llvm/trunk/include/llvm/PassManagers.h (original)
+++ llvm/trunk/include/llvm/PassManagers.h Fri Aug  8 00:33:04 2008
@@ -309,7 +309,7 @@
   void dumpPassInfo(Pass *P, enum PassDebuggingString S1,
                     enum PassDebuggingString S2, const char *Msg);
   void dumpAnalysisSetInfo(const char *Msg, Pass *P,
-                           const std::vector &Set) const;
+                           const AnalysisUsage::VectorType &Set) const;
 
   virtual unsigned getNumContainedPasses() const {
     return (unsigned)PassVector.size();

Modified: llvm/trunk/lib/VMCore/Pass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Pass.cpp?rev=54515&r1=54514&r2=54515&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Pass.cpp (original)
+++ llvm/trunk/lib/VMCore/Pass.cpp Fri Aug  8 00:33:04 2008
@@ -294,8 +294,9 @@
 
 namespace {
   struct GetCFGOnlyPasses : public PassRegistrationListener {
-    std::vector &CFGOnlyList;
-    GetCFGOnlyPasses(std::vector &L) : CFGOnlyList(L) {}
+    typedef AnalysisUsage::VectorType VectorType;
+    VectorType &CFGOnlyList;
+    GetCFGOnlyPasses(VectorType &L) : CFGOnlyList(L) {}
     
     void passEnumerate(const PassInfo *P) {
       if (P->isCFGOnlyPass())

Modified: llvm/trunk/lib/VMCore/PassManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/PassManager.cpp?rev=54515&r1=54514&r2=54515&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/PassManager.cpp (original)
+++ llvm/trunk/lib/VMCore/PassManager.cpp Fri Aug  8 00:33:04 2008
@@ -441,8 +441,8 @@
 
   AnalysisUsage AnUsage;
   P->getAnalysisUsage(AnUsage);
-  const std::vector &RequiredSet = AnUsage.getRequiredSet();
-  for (std::vector::const_iterator I = RequiredSet.begin(),
+  const AnalysisUsage::VectorType &RequiredSet = AnUsage.getRequiredSet();
+  for (AnalysisUsage::VectorType::const_iterator I = RequiredSet.begin(),
          E = RequiredSet.end(); I != E; ++I) {
 
     Pass *AnalysisPass = findAnalysisPass(*I);
@@ -584,7 +584,7 @@
   if (AnUsage.getPreservesAll())
     return true;
   
-  const std::vector &PreservedSet = AnUsage.getPreservedSet();
+  const AnalysisUsage::VectorType &PreservedSet = AnUsage.getPreservedSet();
   for (std::vector::iterator I = HigherLevelAnalysis.begin(),
          E = HigherLevelAnalysis.end(); I  != E; ++I) {
     Pass *P1 = *I;
@@ -606,10 +606,10 @@
 #endif
   AnalysisUsage AnUsage;
   P->getAnalysisUsage(AnUsage);
-  const std::vector &PreservedSet = AnUsage.getPreservedSet();
+  const AnalysisUsage::VectorType &PreservedSet = AnUsage.getPreservedSet();
 
   // Verify preserved analysis
-  for (std::vector::const_iterator I = PreservedSet.begin(),
+  for (AnalysisUsage::VectorType::const_iterator I = PreservedSet.begin(),
          E = PreservedSet.end(); I != E; ++I) {
     AnalysisID AID = *I;
     if (Pass *AP = findAnalysisPass(AID, true))
@@ -664,7 +664,7 @@
   if (AnUsage.getPreservesAll())
     return;
 
-  const std::vector &PreservedSet = AnUsage.getPreservedSet();
+  const AnalysisUsage::VectorType &PreservedSet = AnUsage.getPreservedSet();
   for (std::map::iterator I = AvailableAnalysis.begin(),
          E = AvailableAnalysis.end(); I != E; ) {
     std::map::iterator Info = I++;
@@ -822,8 +822,8 @@
                                             Pass *P) {
   AnalysisUsage AnUsage;
   P->getAnalysisUsage(AnUsage);
-  const std::vector &RequiredSet = AnUsage.getRequiredSet();
-  for (std::vector::const_iterator 
+  const AnalysisUsage::VectorType &RequiredSet = AnUsage.getRequiredSet();
+  for (AnalysisUsage::VectorType::const_iterator 
          I = RequiredSet.begin(), E = RequiredSet.end();
        I != E; ++I) {
     AnalysisID AID = *I;
@@ -833,8 +833,8 @@
       RP_NotAvail.push_back(AID);
   }
 
-  const std::vector &IDs = AnUsage.getRequiredTransitiveSet();
-  for (std::vector::const_iterator I = IDs.begin(),
+  const AnalysisUsage::VectorType &IDs = AnUsage.getRequiredTransitiveSet();
+  for (AnalysisUsage::VectorType::const_iterator I = IDs.begin(),
          E = IDs.end(); I != E; ++I) {
     AnalysisID AID = *I;
     if (Pass *AnalysisPass = findAnalysisPass(*I, true))
@@ -853,7 +853,7 @@
   AnalysisUsage AnUsage;
   P->getAnalysisUsage(AnUsage);
  
-  for (std::vector::const_iterator
+  for (AnalysisUsage::VectorType::const_iterator
          I = AnUsage.getRequiredSet().begin(),
          E = AnUsage.getRequiredSet().end(); I != E; ++I) {
     Pass *Impl = findAnalysisPass(*I, true);
@@ -955,7 +955,7 @@
 }
 
 void PMDataManager::dumpAnalysisSetInfo(const char *Msg, Pass *P,
-                                        const std::vector &Set) 
+                                        const AnalysisUsage::VectorType &Set)
   const {
   if (PassDebugging >= Details && !Set.empty()) {
     cerr << (void*)P << std::string(getDepth()*2+3, ' ') << Msg << " Analyses:";




From bruno.cardoso at gmail.com  Fri Aug  8 01:16:31 2008
From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes)
Date: Fri, 08 Aug 2008 06:16:31 -0000
Subject: [llvm-commits] [llvm] r54516 - in /llvm/trunk:
 lib/Target/Mips/MipsISelLowering.cpp lib/Target/Mips/MipsInstrInfo.td
 lib/Target/Mips/MipsSubtarget.cpp test/CodeGen/Mips/2008-08-08-ctlz.ll
Message-ID: <200808080616.m786GWd7000802@zion.cs.uiuc.edu>

Author: bruno
Date: Fri Aug  8 01:16:31 2008
New Revision: 54516

URL: http://llvm.org/viewvc/llvm-project?rev=54516&view=rev
Log:
Support added for ctlz intrinsic, test case added.

Added:
    llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll
Modified:
    llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
    llvm/trunk/lib/Target/Mips/MipsInstrInfo.td
    llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp

Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=54516&r1=54515&r2=54516&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Fri Aug  8 01:16:31 2008
@@ -119,7 +119,6 @@
   setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i1,    Expand);
   setOperationAction(ISD::CTPOP,             MVT::i32,   Expand);
   setOperationAction(ISD::CTTZ,              MVT::i32,   Expand);
-  setOperationAction(ISD::CTLZ,              MVT::i32,   Expand);
   setOperationAction(ISD::ROTL,              MVT::i32,   Expand);
   setOperationAction(ISD::ROTR,              MVT::i32,   Expand);
   setOperationAction(ISD::BSWAP,             MVT::i32,   Expand);
@@ -147,6 +146,9 @@
     setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i16, Expand);
   }
 
+  if (!Subtarget->hasBitCount())
+    setOperationAction(ISD::CTLZ, MVT::i32, Expand);
+
   setStackPointerRegisterToSaveRestore(Mips::SP);
   computeRegisterProperties();
 }

Modified: llvm/trunk/lib/Target/Mips/MipsInstrInfo.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrInfo.td?rev=54516&r1=54515&r2=54516&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsInstrInfo.td (original)
+++ llvm/trunk/lib/Target/Mips/MipsInstrInfo.td Fri Aug  8 01:16:31 2008
@@ -51,7 +51,8 @@
 //===----------------------------------------------------------------------===//
 // Mips Instruction Predicate Definitions.
 //===----------------------------------------------------------------------===//
-def HasSEInReg : Predicate<"Subtarget.hasSEInReg()">;
+def HasSEInReg  : Predicate<"Subtarget.hasSEInReg()">;
+def HasBitCount : Predicate<"Subtarget.hasBitCount()">;
 
 //===----------------------------------------------------------------------===//
 // Mips Operand, Complex Patterns and Transformations Definitions.
@@ -332,15 +333,6 @@
       !strconcat(instr_asm, "\t$src"),
       [], IIHiLo>;
 
-// Count Leading Ones/Zeros in Word
-class CountLeading func, string instr_asm>:
-  FR< 0x1c,
-      func,
-      (outs CPURegs:$dst),
-      (ins CPURegs:$src),
-      !strconcat(instr_asm, "\t$dst, $src"),
-      [], IIAlu>;
-
 class EffectiveAddress :
   FI<0x09,
      (outs CPURegs:$dst),
@@ -348,6 +340,13 @@
      instr_asm,
      [(set CPURegs:$dst, addr:$addr)], IIAlu>;
 
+// Count Leading Ones/Zeros in Word
+class CountLeading func, string instr_asm, SDNode CountOp>:
+  FR< 0x1c, func, (outs CPURegs:$dst), (ins CPURegs:$src),
+      !strconcat(instr_asm, "\t$dst, $src"), 
+      [(set CPURegs:$dst, (CountOp CPURegs:$src))], IIAlu>;
+
+// Sign Extend in Register.
 class SignExtInReg func, string instr_asm, ValueType vt>:
   FR< 0x3f, func, (outs CPURegs:$dst), (ins CPURegs:$src),
       !strconcat(instr_asm, "\t$dst, $src"),
@@ -494,6 +493,12 @@
     def SEH : SignExtInReg<0x20, "seh", i16>;
 }
 
+/// Count Leading
+let Predicates = [HasBitCount] in {
+  def CLZ : CountLeading<0b010110, "clz", ctlz>;
+//def CLO : CountLeading<0b010110, "clo">;
+}
+
 /// No operation
 let addr=0 in
   def NOP   : FJ<0, (outs), (ins), "nop", [], IIAlu>;
@@ -504,13 +509,6 @@
 // can be matched. It's similar to Sparc LEA_ADDRi
 def LEA_ADDiu : EffectiveAddress<"addiu\t$dst, ${addr:stackloc}">;
 
-// Count Leading
-// CLO/CLZ are part of the newer MIPS32(tm) instruction
-// set and not older Mips I keep this for future use
-// though. 
-//def CLO     : CountLeading<0x21, "clo">;
-//def CLZ     : CountLeading<0x20, "clz">;
-
 // MADD*/MSUB* are not part of MipsI either.
 //def MADD    : MArithR<0x00, "madd">;
 //def MADDU   : MArithR<0x01, "maddu">;

Modified: llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp?rev=54516&r1=54515&r2=54516&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp Fri Aug  8 01:16:31 2008
@@ -57,6 +57,7 @@
     MipsArchVersion = Mips2;
     HasVFPU = true; // Enables Allegrex Vector FPU (not supported yet)
     HasSEInReg = true;
+    HasBitCount = true;
   }
 
   // Abicall is the default for O32 ABI and is ignored 

Added: llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll?rev=54516&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll (added)
+++ llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll Fri Aug  8 01:16:31 2008
@@ -0,0 +1,12 @@
+; RUN: llvm-as < %s | llc -march=mips | grep clz | count 1
+
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64"
+target triple = "mipsallegrexel-psp-elf"
+
+define i32 @A0(i32 %u) nounwind  {
+entry:
+	call i32 @llvm.ctlz.i32( i32 %u )
+  ret i32 %0
+}
+
+declare i32 @llvm.ctlz.i32(i32) nounwind readnone 




From nicholas at mxc.ca  Fri Aug  8 01:34:07 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Fri, 08 Aug 2008 06:34:07 -0000
Subject: [llvm-commits] [llvm] r54517 - in /llvm/trunk:
 lib/CodeGen/AsmPrinter.cpp
 test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll
Message-ID: <200808080634.m786Y7en001477@zion.cs.uiuc.edu>

Author: nicholas
Date: Fri Aug  8 01:34:07 2008
New Revision: 54517

URL: http://llvm.org/viewvc/llvm-project?rev=54517&view=rev
Log:
Don't crash printing the asm for a ConstantExpr PtrToInt just because the int
is narrower than the pointer. This testcase emits:

  .byte (((17) - 16) & 255)


Added:
    llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll
Modified:
    llvm/trunk/lib/CodeGen/AsmPrinter.cpp

Modified: llvm/trunk/lib/CodeGen/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter.cpp?rev=54517&r1=54516&r2=54517&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter.cpp Fri Aug  8 01:34:07 2008
@@ -821,12 +821,13 @@
 
       // We can emit the pointer value into this slot if the slot is an
       // integer slot greater or equal to the size of the pointer.
-      if (Ty->isInteger() &&
-          TD->getABITypeSize(Ty) >= TD->getABITypeSize(Op->getType()))
+      if (TD->getABITypeSize(Ty) >= TD->getABITypeSize(Op->getType()))
         return EmitConstantValueOnly(Op);
-      
-      assert(0 && "FIXME: Don't yet support this kind of constant cast expr");
+
+      O << "((";
       EmitConstantValueOnly(Op);
+      APInt ptrMask = APInt::getAllOnesValue(TD->getABITypeSizeInBits(Ty));
+      O << ") & " << ptrMask.toStringUnsigned() << ')';
       break;
     }
     case Instruction::Add:

Added: llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll?rev=54517&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll (added)
+++ llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll Fri Aug  8 01:34:07 2008
@@ -0,0 +1,7 @@
+; RUN: llvm-as < %s | llc
+; PR2603
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32"
+target triple = "i386-pc-linux-gnu"
+        %struct.A = type { i8 }
+        %struct.B = type { i8, [1 x i8] }
+ at Foo = constant %struct.A { i8 ptrtoint (i8* getelementptr ([1 x i8]* inttoptr (i32 17 to [1 x i8]*), i32 0, i32 -16) to i8) }          ; <%struct.A*> [#uses=0]




From evan.cheng at apple.com  Fri Aug  8 01:43:59 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 08 Aug 2008 06:43:59 -0000
Subject: [llvm-commits] [llvm] r54518 -
	/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp
Message-ID: <200808080643.m786hxgR002097@zion.cs.uiuc.edu>

Author: evancheng
Date: Fri Aug  8 01:43:59 2008
New Revision: 54518

URL: http://llvm.org/viewvc/llvm-project?rev=54518&view=rev
Log:
Fix indentation.

Modified:
    llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp

Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp?rev=54518&r1=54517&r2=54518&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Fri Aug  8 01:43:59 2008
@@ -839,9 +839,9 @@
   }
 
   switch (GVar->getLinkage()) {
-   case GlobalValue::CommonLinkage:
-   case GlobalValue::LinkOnceLinkage:
-   case GlobalValue::WeakLinkage:
+  case GlobalValue::CommonLinkage:
+  case GlobalValue::LinkOnceLinkage:
+  case GlobalValue::WeakLinkage:
     if (Subtarget->isTargetDarwin()) {
       O << "\t.globl " << name << '\n'
         << TAI->getWeakDefDirective() << name << '\n';
@@ -852,17 +852,17 @@
       O << "\t.weak\t" << name << '\n';
     }
     break;
-   case GlobalValue::DLLExportLinkage:
-   case GlobalValue::AppendingLinkage:
+  case GlobalValue::DLLExportLinkage:
+  case GlobalValue::AppendingLinkage:
     // FIXME: appending linkage variables should go into a section of
     // their name or something.  For now, just emit them as external.
-   case GlobalValue::ExternalLinkage:
+  case GlobalValue::ExternalLinkage:
     // If external or appending, declare as a global symbol
     O << "\t.globl " << name << '\n';
     // FALL THROUGH
-   case GlobalValue::InternalLinkage:
+  case GlobalValue::InternalLinkage:
      break;
-   default:
+  default:
     assert(0 && "Unknown linkage type!");
   }
 




From evan.cheng at apple.com  Fri Aug  8 01:56:16 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 08 Aug 2008 06:56:16 -0000
Subject: [llvm-commits] [llvm] r54519 - in /llvm/trunk:
 include/llvm/Target/DarwinTargetAsmInfo.h
 include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h
 lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/DarwinTargetAsmInfo.cpp
 lib/Target/ELFTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.cpp
 lib/Target/Mips/MipsTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp
 test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll
Message-ID: <200808080656.m786uHPq002844@zion.cs.uiuc.edu>

Author: evancheng
Date: Fri Aug  8 01:56:16 2008
New Revision: 54519

URL: http://llvm.org/viewvc/llvm-project?rev=54519&view=rev
Log:
It's not legal to output a GV in a coalesced section if it's used in an ARM PIC relative constantpool.

Added:
    llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll
Modified:
    llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
    llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
    llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h
    llvm/trunk/lib/Target/TargetAsmInfo.cpp

Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Fri Aug  8 01:56:16 2008
@@ -30,7 +30,8 @@
     const Section* DataCoalSection;
 
     explicit DarwinTargetAsmInfo(const TargetMachine &TM);
-    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
+    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
+                                                 bool NoCoalesce = false) const;
     virtual std::string UniqueSectionForGlobal(const GlobalValue* GV,
                                                SectionKind::Kind kind) const;
     const Section* MergeableConstSection(const GlobalVariable *GV) const;

Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h Fri Aug  8 01:56:16 2008
@@ -26,7 +26,8 @@
   struct ELFTargetAsmInfo: public virtual TargetAsmInfo {
     explicit ELFTargetAsmInfo(const TargetMachine &TM);
 
-    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
+    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
+                                                 bool NoCoalesce = false) const;
     virtual std::string PrintSectionFlags(unsigned flags) const;
     const Section* MergeableConstSection(const GlobalVariable *GV) const;
     inline const Section* MergeableConstSection(const Type *Ty) const;

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Fri Aug  8 01:56:16 2008
@@ -544,8 +544,10 @@
                           const char* name = NULL) const;
 
     /// SectionForGlobal - This hooks returns proper section name for given
-    /// global with all necessary flags and marks.
-    virtual std::string SectionForGlobal(const GlobalValue *GV) const;
+    /// global with all necessary flags and marks. If NoCoalesce is true,
+    /// do not use coalesced section.
+    virtual std::string SectionForGlobal(const GlobalValue *GV,
+                                         bool NoCoalesce = false) const;
 
     // Helper methods for SectionForGlobal
     virtual std::string UniqueSectionForGlobal(const GlobalValue* GV,
@@ -553,7 +555,8 @@
 
     virtual std::string PrintSectionFlags(unsigned flags) const { return ""; }
 
-    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
+    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
+                                                 bool NoCoalesce = false) const;
 
     virtual const Section* SelectSectionForMachineConst(const Type *Ty) const;
 

Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Fri Aug  8 01:56:16 2008
@@ -29,6 +29,7 @@
 #include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
 #include "llvm/Target/TargetOptions.h"
+#include "llvm/ADT/SmallPtrSet.h"
 #include "llvm/ADT/Statistic.h"
 #include "llvm/ADT/StringExtras.h"
 #include "llvm/Support/Compiler.h"
@@ -65,14 +66,18 @@
     typedef std::map ValueMapTy;
     ValueMapTy NumberForBB;
 
-    /// Keeps the set of GlobalValues that require non-lazy-pointers for
-    /// indirect access.
+    /// GVNonLazyPtrs - Keeps the set of GlobalValues that require
+    /// non-lazy-pointers for indirect access.
     std::set GVNonLazyPtrs;
 
-    /// Keeps the set of external function GlobalAddresses that the asm
-    /// printer should generate stubs for.
+    /// FnStubs - Keeps the set of external function GlobalAddresses that the
+    /// asm printer should generate stubs for.
     std::set FnStubs;
 
+    /// PCRelGVs - Keeps the set of GlobalValues used in pc relative
+    /// constantpool.
+    SmallPtrSet PCRelGVs;
+
     /// True if asm printer is printing a series of CONSTPOOL_ENTRY.
     bool InCPMode;
     
@@ -124,10 +129,12 @@
     /// specified function body into.
     virtual std::string getSectionForFunction(const Function &F) const;
 
+    /// EmitMachineConstantPoolValue - Print a machine constantpool value to
+    /// the .s file.
     virtual void EmitMachineConstantPoolValue(MachineConstantPoolValue *MCPV) {
       printDataDirective(MCPV->getType());
 
-      ARMConstantPoolValue *ACPV = (ARMConstantPoolValue*)MCPV;
+      ARMConstantPoolValue *ACPV = static_cast(MCPV);
       GlobalValue *GV = ACPV->getGV();
       std::string Name = GV ? Mang->getValueName(GV) : TAI->getGlobalPrefix();
       if (!GV)
@@ -680,9 +687,15 @@
     const MachineConstantPoolEntry &MCPE =  // Chasing pointers is fun?
       MI->getParent()->getParent()->getConstantPool()->getConstants()[CPI];
     
-    if (MCPE.isMachineConstantPoolEntry())
+    if (MCPE.isMachineConstantPoolEntry()) {
       EmitMachineConstantPoolValue(MCPE.Val.MachineCPVal);
-    else {
+      ARMConstantPoolValue *ACPV =
+        static_cast(MCPE.Val.MachineCPVal);
+      if (ACPV->getPCAdjustment() != 0) {
+        const GlobalValue *GV = ACPV->getGV();
+        PCRelGVs.insert(GV);
+      }
+    } else {
       EmitGlobalConstant(MCPE.Val.ConstVal);
       // remember to emit the weak reference
       if (const GlobalValue *GV = dyn_cast(MCPE.Val.ConstVal))
@@ -850,7 +863,8 @@
     return;
   }
 
-  std::string SectionName = TAI->SectionForGlobal(GVar);
+  bool NoCoalesc = PCRelGVs.count(GVar);
+  std::string SectionName = TAI->SectionForGlobal(GVar, NoCoalesc);
   std::string name = Mang->getValueName(GVar);
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();
@@ -887,7 +901,7 @@
       if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
 
       if (TAI->getLCOMMDirective() != NULL) {
-        if (GVar->hasInternalLinkage()) {
+        if (NoCoalesc || GVar->hasInternalLinkage()) {
           O << TAI->getLCOMMDirective() << name << "," << Size;
           if (Subtarget->isTargetDarwin())
             O << "," << Align;

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Fri Aug  8 01:56:16 2008
@@ -51,14 +51,15 @@
 }
 
 const Section*
-DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
+DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
+                                            bool NoCoalesce) const {
   SectionKind::Kind Kind = SectionKindForGlobal(GV);
-  bool isWeak = GV->isWeakForLinker();
+  bool CanCoalesce = !NoCoalesce && GV->isWeakForLinker();
   bool isNonStatic = (DTM->getRelocationModel() != Reloc::Static);
 
   switch (Kind) {
    case SectionKind::Text:
-    if (isWeak)
+    if (CanCoalesce)
       return TextCoalSection;
     else
       return getTextSection_();
@@ -67,18 +68,18 @@
    case SectionKind::BSS:
    case SectionKind::ThreadBSS:
     if (cast(GV)->isConstant())
-      return (isWeak ? ConstDataCoalSection : ConstDataSection);
+      return (CanCoalesce ? ConstDataCoalSection : ConstDataSection);
     else
-      return (isWeak ? DataCoalSection : getDataSection_());
+      return (CanCoalesce ? DataCoalSection : getDataSection_());
    case SectionKind::ROData:
-    return (isWeak ? ConstDataCoalSection :
+    return (CanCoalesce ? ConstDataCoalSection :
             (isNonStatic ? ConstDataSection : getReadOnlySection_()));
    case SectionKind::RODataMergeStr:
-    return (isWeak ?
+    return (CanCoalesce ?
             ConstDataCoalSection :
             MergeableStringSection(cast(GV)));
    case SectionKind::RODataMergeConst:
-    return (isWeak ?
+    return (CanCoalesce ?
             ConstDataCoalSection:
             MergeableConstSection(cast(GV)));
    default:

Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Fri Aug  8 01:56:16 2008
@@ -40,7 +40,8 @@
 }
 
 const Section*
-ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
+ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
+                                         bool NoCoalesce) const {
   SectionKind::Kind Kind = SectionKindForGlobal(GV);
 
   if (const Function *F = dyn_cast(GV)) {

Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp Fri Aug  8 01:56:16 2008
@@ -82,7 +82,7 @@
 }
 
 const Section* MipsTargetAsmInfo::
-SelectSectionForGlobal(const GlobalValue *GV) const {
+SelectSectionForGlobal(const GlobalValue *GV, bool NoCoalesce) const {
   SectionKind::Kind K = SectionKindForGlobal(GV);
   const GlobalVariable *GVA = dyn_cast(GV);
 

Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h Fri Aug  8 01:56:16 2008
@@ -40,7 +40,8 @@
     SectionFlagsForGlobal(const GlobalValue *GV = NULL,
                           const char* name = NULL) const;
 
-    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
+    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
+                                                  bool NoCoalesce) const;
 
     private:
       const MipsSubtarget *Subtarget;

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=54519&r1=54518&r2=54519&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Fri Aug  8 01:56:16 2008
@@ -272,7 +272,7 @@
 }
 
 std::string
-TargetAsmInfo::SectionForGlobal(const GlobalValue *GV) const {
+TargetAsmInfo::SectionForGlobal(const GlobalValue *GV, bool NoCoalesce) const {
   const Section* S;
   // Select section name
   if (GV->hasSection()) {
@@ -282,7 +282,7 @@
     S = getNamedSection(GV->getSection().c_str(), Flags);
   } else {
     // Use default section depending on the 'type' of global
-    S = SelectSectionForGlobal(GV);
+    S = SelectSectionForGlobal(GV, NoCoalesce);
   }
 
   if (!S->isNamed())
@@ -295,8 +295,8 @@
 }
 
 // Lame default implementation. Calculate the section name for global.
-const Section*
-TargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
+const Section* TargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
+                                                     bool NoCoalesce) const {
   SectionKind::Kind Kind = SectionKindForGlobal(GV);
 
   if (GV->isWeakForLinker()) {

Added: llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll?rev=54519&view=auto

==============================================================================
--- llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll (added)
+++ llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll Fri Aug  8 01:56:16 2008
@@ -0,0 +1,13 @@
+; RUN: llvm-as < %s | llc -mtriple=arm-apple-darwin -mattr=+v6 -relocation-model=pic | grep lcomm
+
+	%struct.FILE = type { i8*, i32, i32, i16, i16, %struct.__sbuf, i32, i8*, i32 (i8*)*, i32 (i8*, i8*, i32)*, i64 (i8*, i64, i32)*, i32 (i8*, i8*, i32)*, %struct.__sbuf, %struct.__sFILEX*, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 }
+	%struct.__gcov_var = type { %struct.FILE*, i32, i32, i32, i32, i32, i32, [1025 x i32] }
+	%struct.__sFILEX = type opaque
+	%struct.__sbuf = type { i8*, i32 }
+ at __gcov_var = common global %struct.__gcov_var zeroinitializer		; <%struct.__gcov_var*> [#uses=1]
+
+define i32 @__gcov_close() nounwind {
+entry:
+	load i32* getelementptr (%struct.__gcov_var* @__gcov_var, i32 0, i32 5), align 4		; :0 [#uses=1]
+	ret i32 %0
+}




From nicholas at mxc.ca  Fri Aug  8 02:00:10 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Fri, 08 Aug 2008 07:00:10 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54520 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Message-ID: <200808080700.m7870AkF003024@zion.cs.uiuc.edu>

Author: nicholas
Date: Fri Aug  8 02:00:09 2008
New Revision: 54520

URL: http://llvm.org/viewvc/llvm-project?rev=54520&view=rev
Log:
Constant fold these GEPs upon construction. PR2603

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54520&r1=54519&r2=54520&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug  8 02:00:09 2008
@@ -6111,7 +6111,7 @@
   case VIEW_CONVERT_EXPR: return Convert(TREE_OPERAND(exp, 0));
   case ADDR_EXPR:     
     return ConstantExpr::getBitCast(EmitLV(TREE_OPERAND(exp, 0)),
-                                 ConvertType(TREE_TYPE(exp)));
+                                    ConvertType(TREE_TYPE(exp)));
   }
 }
 
@@ -6979,7 +6979,14 @@
   if (isArrayCompatible(ArrayType))
     Idx.push_back(ConstantInt::get(Type::Int32Ty, 0));
   Idx.push_back(IndexVal);
-  return ConstantExpr::getGetElementPtr(ArrayAddr, &Idx[0], Idx.size());
+
+  Constant *ArrayRef = ConstantExpr::getGetElementPtr(ArrayAddr, &Idx[0],
+                                                      Idx.size());
+
+  if (ConstantExpr *CE = dyn_cast(ArrayRef))
+    return ConstantFoldConstantExpression(CE, &getTargetData());
+  else
+    return ArrayRef;
 }
 
 Constant *TreeConstantToLLVM::EmitLV_COMPONENT_REF(tree exp) {




From nicholas at mxc.ca  Fri Aug  8 02:00:26 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Fri, 08 Aug 2008 07:00:26 -0000
Subject: [llvm-commits] [llvm] r54521 -
	/llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c
Message-ID: <200808080700.m7870Rf9003044@zion.cs.uiuc.edu>

Author: nicholas
Date: Fri Aug  8 02:00:26 2008
New Revision: 54521

URL: http://llvm.org/viewvc/llvm-project?rev=54521&view=rev
Log:
Testcase for r54520.

Added:
    llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c

Added: llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c?rev=54521&view=auto

==============================================================================
--- llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c (added)
+++ llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c Fri Aug  8 02:00:26 2008
@@ -0,0 +1,14 @@
+// RUN: %llvmgcc -S %s -o - | grep {i8 1}
+// PR2603
+
+struct A {
+  char num_fields;
+};
+
+struct B {
+  char a, b[1];
+};
+
+const struct A Foo = {
+  (char *)(&( (struct B *)(16) )->b[0]) - (char *)(16)
+};




From evan.cheng at apple.com  Fri Aug  8 02:27:31 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 08 Aug 2008 07:27:31 -0000
Subject: [llvm-commits] [llvm] r54522 - in
 /llvm/trunk/lib/CodeGen/SelectionDAG: SelectionDAGISel.cpp SimpleBBISel.cpp
 SimpleBBISel.h
Message-ID: <200808080727.m787RVcZ003959@zion.cs.uiuc.edu>

Author: evancheng
Date: Fri Aug  8 02:27:28 2008
New Revision: 54522

URL: http://llvm.org/viewvc/llvm-project?rev=54522&view=rev
Log:
Add skeleton of simple basic block instruction selector.

Added:
    llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp
    llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h
Modified:
    llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp

Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54522&r1=54521&r2=54522&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Fri Aug  8 02:27:28 2008
@@ -12,10 +12,10 @@
 //===----------------------------------------------------------------------===//
 
 #define DEBUG_TYPE "isel"
+#include "llvm/CodeGen/SelectionDAGISel.h"
+#include "SimpleBBISel.h"
 #include "llvm/ADT/BitVector.h"
 #include "llvm/Analysis/AliasAnalysis.h"
-#include "llvm/CodeGen/SelectionDAGISel.h"
-#include "llvm/CodeGen/ScheduleDAG.h"
 #include "llvm/Constants.h"
 #include "llvm/CallingConv.h"
 #include "llvm/DerivedTypes.h"
@@ -33,6 +33,7 @@
 #include "llvm/CodeGen/MachineJumpTableInfo.h"
 #include "llvm/CodeGen/MachineModuleInfo.h"
 #include "llvm/CodeGen/MachineRegisterInfo.h"
+#include "llvm/CodeGen/ScheduleDAG.h"
 #include "llvm/CodeGen/SchedulerRegistry.h"
 #include "llvm/CodeGen/SelectionDAG.h"
 #include "llvm/Target/TargetRegisterInfo.h"
@@ -5441,11 +5442,14 @@
   // each basic block.
   NodeAllocatorType NodeAllocator;
 
+  SimpleBBISel SISel(MF, TLI);
   std::vector > PHINodesToUpdate;
   for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) {
     BasicBlock *LLVMBB = &*I;
     PHINodesToUpdate.clear();
-    SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator);
+
+    if (!FastISel || !SISel.SelectBasicBlock(LLVMBB,  FuncInfo.MBBMap[LLVMBB]))
+      SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator);
     FinishBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator);
   }
 }

Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp?rev=54522&view=auto

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp (added)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp Fri Aug  8 02:27:28 2008
@@ -0,0 +1,29 @@
+//===-- SimpleBBISel.cpp - Implement the SimpleBBISel class ---------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This implements simple basic block instruction selection. If the given
+// BasicBlock is considered "simple", i.e. all operations are supported by
+// the target and their types are legal, it does instruction directly from
+// LLVM BasicBlock to MachineInstr's.
+//
+//===----------------------------------------------------------------------===//
+
+#define DEBUG_TYPE "simple-isel"
+#include "SimpleBBISel.h"
+#include "llvm/CodeGen/MachineFunction.h"
+#include "llvm/CodeGen/MachineInstrBuilder.h"
+#include "llvm/CodeGen/SelectionDAG.h"
+using namespace llvm;
+
+/// SelectBasicBlock - Try to convert a LLVM basic block into a
+/// MachineBasicBlock using simple instruction selection. Returns false if it
+/// is not able to do so.
+bool SimpleBBISel::SelectBasicBlock(BasicBlock *BB, MachineBasicBlock *MBB) {
+  return false;
+}

Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h?rev=54522&view=auto

==============================================================================
--- llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h (added)
+++ llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h Fri Aug  8 02:27:28 2008
@@ -0,0 +1,45 @@
+//===-- SimpleBBISel.cpp - Definition of the SimpleBBISel class -----------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+//
+// This file defines the SimpleBBISel class which handles simple basic block
+// instruction selection. If the given BasicBlock is considered "simple", i.e.
+// all operations are supported by the target and their types are legal, it
+// does instruction directly from LLVM BasicBlock to MachineInstr's.
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef SELECTIONDAG_SIMPLEBBISEL_H
+#define SELECTIONDAG_SIMPLEBBISEL_H
+
+#include "llvm/Support/Compiler.h"
+
+namespace llvm {
+
+class BasicBlock;
+class MachineBasicBlock;
+class MachineFunction;
+class TargetLowering;
+
+class VISIBILITY_HIDDEN SimpleBBISel {
+  MachineFunction &MF;
+  TargetLowering &TLI;
+  
+ public:
+  explicit SimpleBBISel(MachineFunction &mf, TargetLowering &tli)
+    : MF(mf), TLI(tli) {};
+
+  /// SelectBasicBlock - Try to convert a LLVM basic block into a
+  /// MachineBasicBlock using simple instruction selection. Returns false if it
+  /// is not able to do so.
+  bool SelectBasicBlock(BasicBlock *BB, MachineBasicBlock *MBB);
+};
+  
+} // end namespace llvm.
+
+#endif




From nicolas.geoffray at lip6.fr  Fri Aug  8 02:30:34 2008
From: nicolas.geoffray at lip6.fr (Nicolas Geoffray)
Date: Fri, 08 Aug 2008 00:30:34 -0700
Subject: [llvm-commits] [llvm] r54522 - in
 /llvm/trunk/lib/CodeGen/SelectionDAG: SelectionDAGISel.cpp SimpleBBISel.cpp
 SimpleBBISel.h
In-Reply-To: <200808080727.m787RVcZ003959@zion.cs.uiuc.edu>
References: <200808080727.m787RVcZ003959@zion.cs.uiuc.edu>
Message-ID: <489BF61A.7050509@lip6.fr>

That's awesome Evan! ;-)

Thanks! It's going the right direction... :)

Nicolas

Evan Cheng wrote:
> Author: evancheng
> Date: Fri Aug  8 02:27:28 2008
> New Revision: 54522
>
> URL: http://llvm.org/viewvc/llvm-project?rev=54522&view=rev
> Log:
> Add skeleton of simple basic block instruction selector.
>
> Added:
>     llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp
>     llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h
> Modified:
>     llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
>
> Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54522&r1=54521&r2=54522&view=diff
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Fri Aug  8 02:27:28 2008
> @@ -12,10 +12,10 @@
>  //===----------------------------------------------------------------------===//
>  
>  #define DEBUG_TYPE "isel"
> +#include "llvm/CodeGen/SelectionDAGISel.h"
> +#include "SimpleBBISel.h"
>  #include "llvm/ADT/BitVector.h"
>  #include "llvm/Analysis/AliasAnalysis.h"
> -#include "llvm/CodeGen/SelectionDAGISel.h"
> -#include "llvm/CodeGen/ScheduleDAG.h"
>  #include "llvm/Constants.h"
>  #include "llvm/CallingConv.h"
>  #include "llvm/DerivedTypes.h"
> @@ -33,6 +33,7 @@
>  #include "llvm/CodeGen/MachineJumpTableInfo.h"
>  #include "llvm/CodeGen/MachineModuleInfo.h"
>  #include "llvm/CodeGen/MachineRegisterInfo.h"
> +#include "llvm/CodeGen/ScheduleDAG.h"
>  #include "llvm/CodeGen/SchedulerRegistry.h"
>  #include "llvm/CodeGen/SelectionDAG.h"
>  #include "llvm/Target/TargetRegisterInfo.h"
> @@ -5441,11 +5442,14 @@
>    // each basic block.
>    NodeAllocatorType NodeAllocator;
>  
> +  SimpleBBISel SISel(MF, TLI);
>    std::vector > PHINodesToUpdate;
>    for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) {
>      BasicBlock *LLVMBB = &*I;
>      PHINodesToUpdate.clear();
> -    SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator);
> +
> +    if (!FastISel || !SISel.SelectBasicBlock(LLVMBB,  FuncInfo.MBBMap[LLVMBB]))
> +      SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator);
>      FinishBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator);
>    }
>  }
>
> Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp?rev=54522&view=auto
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp (added)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp Fri Aug  8 02:27:28 2008
> @@ -0,0 +1,29 @@
> +//===-- SimpleBBISel.cpp - Implement the SimpleBBISel class ---------------===//
> +//
> +//                     The LLVM Compiler Infrastructure
> +//
> +// This file is distributed under the University of Illinois Open Source
> +// License. See LICENSE.TXT for details.
> +//
> +//===----------------------------------------------------------------------===//
> +//
> +// This implements simple basic block instruction selection. If the given
> +// BasicBlock is considered "simple", i.e. all operations are supported by
> +// the target and their types are legal, it does instruction directly from
> +// LLVM BasicBlock to MachineInstr's.
> +//
> +//===----------------------------------------------------------------------===//
> +
> +#define DEBUG_TYPE "simple-isel"
> +#include "SimpleBBISel.h"
> +#include "llvm/CodeGen/MachineFunction.h"
> +#include "llvm/CodeGen/MachineInstrBuilder.h"
> +#include "llvm/CodeGen/SelectionDAG.h"
> +using namespace llvm;
> +
> +/// SelectBasicBlock - Try to convert a LLVM basic block into a
> +/// MachineBasicBlock using simple instruction selection. Returns false if it
> +/// is not able to do so.
> +bool SimpleBBISel::SelectBasicBlock(BasicBlock *BB, MachineBasicBlock *MBB) {
> +  return false;
> +}
>
> Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h?rev=54522&view=auto
>
> ==============================================================================
> --- llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h (added)
> +++ llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h Fri Aug  8 02:27:28 2008
> @@ -0,0 +1,45 @@
> +//===-- SimpleBBISel.cpp - Definition of the SimpleBBISel class -----------===//
> +//
> +//                     The LLVM Compiler Infrastructure
> +//
> +// This file is distributed under the University of Illinois Open Source
> +// License. See LICENSE.TXT for details.
> +//
> +//===----------------------------------------------------------------------===//
> +//
> +// This file defines the SimpleBBISel class which handles simple basic block
> +// instruction selection. If the given BasicBlock is considered "simple", i.e.
> +// all operations are supported by the target and their types are legal, it
> +// does instruction directly from LLVM BasicBlock to MachineInstr's.
> +//
> +//===----------------------------------------------------------------------===//
> +
> +#ifndef SELECTIONDAG_SIMPLEBBISEL_H
> +#define SELECTIONDAG_SIMPLEBBISEL_H
> +
> +#include "llvm/Support/Compiler.h"
> +
> +namespace llvm {
> +
> +class BasicBlock;
> +class MachineBasicBlock;
> +class MachineFunction;
> +class TargetLowering;
> +
> +class VISIBILITY_HIDDEN SimpleBBISel {
> +  MachineFunction &MF;
> +  TargetLowering &TLI;
> +  
> + public:
> +  explicit SimpleBBISel(MachineFunction &mf, TargetLowering &tli)
> +    : MF(mf), TLI(tli) {};
> +
> +  /// SelectBasicBlock - Try to convert a LLVM basic block into a
> +  /// MachineBasicBlock using simple instruction selection. Returns false if it
> +  /// is not able to do so.
> +  bool SelectBasicBlock(BasicBlock *BB, MachineBasicBlock *MBB);
> +};
> +  
> +} // end namespace llvm.
> +
> +#endif
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>   



From baldrick at free.fr  Fri Aug  8 02:50:33 2008
From: baldrick at free.fr (Duncan Sands)
Date: Fri, 8 Aug 2008 09:50:33 +0200
Subject: [llvm-commits] [llvm-gcc-4.2] r54520 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <200808080700.m7870AkF003024@zion.cs.uiuc.edu>
References: <200808080700.m7870AkF003024@zion.cs.uiuc.edu>
Message-ID: <200808080950.33160.baldrick@free.fr>

Hi Nick,

> +  if (ConstantExpr *CE = dyn_cast(ArrayRef))
> +    return ConstantFoldConstantExpression(CE, &getTargetData());

in theory this method can return NULL (at least that's what
the comment on it says).

Ciao,

Duncan.


From evan.cheng at apple.com  Fri Aug  8 03:11:36 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 08 Aug 2008 08:11:36 -0000
Subject: [llvm-commits] [llvm] r54523 - in /llvm/trunk:
 include/llvm/ExecutionEngine/ExecutionEngine.h
 lib/ExecutionEngine/ExecutionEngine.cpp
 lib/ExecutionEngine/ExecutionEngineBindings.cpp
 lib/ExecutionEngine/Interpreter/Interpreter.cpp
 lib/ExecutionEngine/Interpreter/Interpreter.h
 lib/ExecutionEngine/JIT/JIT.cpp lib/ExecutionEngine/JIT/JIT.h
 lib/ExecutionEngine/JIT/TargetSelect.cpp
Message-ID: <200808080811.m788BasH019705@zion.cs.uiuc.edu>

Author: evancheng
Date: Fri Aug  8 03:11:34 2008
New Revision: 54523

URL: http://llvm.org/viewvc/llvm-project?rev=54523&view=rev
Log:
Add new parameter Fast to createJIT to enable the fast codegen path.

Modified:
    llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h
    llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp
    llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp
    llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp
    llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h
    llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp
    llvm/trunk/lib/ExecutionEngine/JIT/JIT.h
    llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp

Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=54523&r1=54522&r2=54523&view=diff

==============================================================================
--- llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h (original)
+++ llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h Fri Aug  8 03:11:34 2008
@@ -79,7 +79,8 @@
   // To avoid having libexecutionengine depend on the JIT and interpreter
   // libraries, the JIT and Interpreter set these functions to ctor pointers
   // at startup time if they are linked in.
-  typedef ExecutionEngine *(*EECtorFn)(ModuleProvider*, std::string*);
+  typedef ExecutionEngine *(*EECtorFn)(ModuleProvider*, std::string*,
+                                       bool Fast);
   static EECtorFn JITCtor, InterpCtor;
 
   /// LazyFunctionCreator - If an unknown function is needed, this function
@@ -108,7 +109,8 @@
   /// module provider.
   static ExecutionEngine *create(ModuleProvider *MP,
                                  bool ForceInterpreter = false,
-                                 std::string *ErrorStr = 0);
+                                 std::string *ErrorStr = 0,
+                                 bool Fast = false);
   
   /// create - This is the factory method for creating an execution engine which
   /// is appropriate for the current machine.  This takes ownership of the
@@ -120,7 +122,8 @@
   /// of the ModuleProvider and JITMemoryManager if successful.
   static ExecutionEngine *createJIT(ModuleProvider *MP,
                                     std::string *ErrorStr = 0,
-                                    JITMemoryManager *JMM = 0);
+                                    JITMemoryManager *JMM = 0,
+                                    bool Fast = false);
   
   
   

Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp?rev=54523&r1=54522&r2=54523&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp Fri Aug  8 03:11:34 2008
@@ -345,7 +345,8 @@
 ///
 ExecutionEngine *ExecutionEngine::create(ModuleProvider *MP,
                                          bool ForceInterpreter,
-                                         std::string *ErrorStr) {
+                                         std::string *ErrorStr,
+                                         bool Fast) {
   ExecutionEngine *EE = 0;
 
   // Make sure we can resolve symbols in the program as well. The zero arg
@@ -355,11 +356,11 @@
 
   // Unless the interpreter was explicitly selected, try making a JIT.
   if (!ForceInterpreter && JITCtor)
-    EE = JITCtor(MP, ErrorStr);
+    EE = JITCtor(MP, ErrorStr, Fast);
 
   // If we can't make a JIT, make an interpreter instead.
   if (EE == 0 && InterpCtor)
-    EE = InterpCtor(MP, ErrorStr);
+    EE = InterpCtor(MP, ErrorStr, Fast);
 
   return EE;
 }

Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp?rev=54523&r1=54522&r2=54523&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp Fri Aug  8 03:11:34 2008
@@ -114,9 +114,11 @@
 
 int LLVMCreateJITCompiler(LLVMExecutionEngineRef *OutJIT,
                           LLVMModuleProviderRef MP,
-                          char **OutError) {
+                          char **OutError,
+                          bool Fast = false) {
   std::string Error;
-  if (ExecutionEngine *JIT = ExecutionEngine::createJIT(unwrap(MP), &Error)) {
+  if (ExecutionEngine *JIT = ExecutionEngine::createJIT(unwrap(MP), &Error, 0,
+                                                        Fast)) {
     *OutJIT = wrap(JIT);
     return 0;
   }

Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp?rev=54523&r1=54522&r2=54523&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp Fri Aug  8 03:11:34 2008
@@ -36,7 +36,8 @@
 
 /// create - Create a new interpreter object.  This can never fail.
 ///
-ExecutionEngine *Interpreter::create(ModuleProvider *MP, std::string* ErrStr) {
+ExecutionEngine *Interpreter::create(ModuleProvider *MP, std::string* ErrStr,
+                                     bool Fast /*unused*/) {
   // Tell this ModuleProvide to materialize and release the module
   if (!MP->materializeModule(ErrStr))
     // We got an error, just return 0

Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h?rev=54523&r1=54522&r2=54523&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h Fri Aug  8 03:11:34 2008
@@ -108,7 +108,8 @@
   
   /// create - Create an interpreter ExecutionEngine. This can never fail.
   ///
-  static ExecutionEngine *create(ModuleProvider *M, std::string *ErrorStr = 0);
+  static ExecutionEngine *create(ModuleProvider *M, std::string *ErrorStr = 0,
+                                 bool Fast /*unused*/ = 0);
 
   /// run - Start execution with the specified function and arguments.
   ///

Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp?rev=54523&r1=54522&r2=54523&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp Fri Aug  8 03:11:34 2008
@@ -73,8 +73,9 @@
 /// of the module provider.
 ExecutionEngine *ExecutionEngine::createJIT(ModuleProvider *MP,
                                             std::string *ErrorStr,
-                                            JITMemoryManager *JMM) {
-  ExecutionEngine *EE = JIT::createJIT(MP, ErrorStr, JMM);
+                                            JITMemoryManager *JMM,
+                                            bool Fast) {
+  ExecutionEngine *EE = JIT::createJIT(MP, ErrorStr, JMM, Fast);
   if (!EE) return 0;
   
   // Register routine for informing unwinding runtime about new EH frames
@@ -89,7 +90,7 @@
 }
 
 JIT::JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji,
-         JITMemoryManager *JMM)
+         JITMemoryManager *JMM, bool Fast)
   : ExecutionEngine(MP), TM(tm), TJI(tji) {
   setTargetData(TM.getTargetData());
 
@@ -105,7 +106,7 @@
 
   // Turn the machine code intermediate representation into bytes in memory that
   // may be executed.
-  if (TM.addPassesToEmitMachineCode(PM, *MCE, false /*fast*/)) {
+  if (TM.addPassesToEmitMachineCode(PM, *MCE, Fast)) {
     cerr << "Target does not support machine code emission!\n";
     abort();
   }

Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.h?rev=54523&r1=54522&r2=54523&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/JIT.h (original)
+++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.h Fri Aug  8 03:11:34 2008
@@ -56,7 +56,7 @@
   JITState *jitstate;
 
   JIT(ModuleProvider *MP, TargetMachine &tm, TargetJITInfo &tji, 
-      JITMemoryManager *JMM);
+      JITMemoryManager *JMM, bool Fast);
 public:
   ~JIT();
 
@@ -71,8 +71,9 @@
   /// create - Create an return a new JIT compiler if there is one available
   /// for the current target.  Otherwise, return null.
   ///
-  static ExecutionEngine *create(ModuleProvider *MP, std::string *Err) {
-    return createJIT(MP, Err, 0);
+  static ExecutionEngine *create(ModuleProvider *MP, std::string *Err,
+                                 bool Fast = false) {
+    return createJIT(MP, Err, 0, Fast);
   }
 
   virtual void addModuleProvider(ModuleProvider *MP);
@@ -128,7 +129,7 @@
   MachineCodeEmitter *getCodeEmitter() const { return MCE; }
   
   static ExecutionEngine *createJIT(ModuleProvider *MP, std::string *Err,
-                                    JITMemoryManager *JMM);
+                                    JITMemoryManager *JMM, bool Fast);
   
 private:
   static MachineCodeEmitter *createEmitter(JIT &J, JITMemoryManager *JMM);

Modified: llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp?rev=54523&r1=54522&r2=54523&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp Fri Aug  8 03:11:34 2008
@@ -41,7 +41,7 @@
 /// available for the current target.  Otherwise, return null.
 ///
 ExecutionEngine *JIT::createJIT(ModuleProvider *MP, std::string *ErrorStr,
-                                JITMemoryManager *JMM) {
+                                JITMemoryManager *JMM, bool Fast) {
   const TargetMachineRegistry::entry *TheArch = MArch;
   if (TheArch == 0) {
     std::string Error;
@@ -73,7 +73,7 @@
 
   // If the target supports JIT code generation, return a new JIT now.
   if (TargetJITInfo *TJ = Target->getJITInfo())
-    return new JIT(MP, *Target, *TJ, JMM);
+    return new JIT(MP, *Target, *TJ, JMM, Fast);
 
   if (ErrorStr)
     *ErrorStr = "target does not support JIT code generation";




From evan.cheng at apple.com  Fri Aug  8 03:12:07 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 08 Aug 2008 08:12:07 -0000
Subject: [llvm-commits] [llvm] r54524 - /llvm/trunk/tools/lli/lli.cpp
Message-ID: <200808080812.m788C7Xd019806@zion.cs.uiuc.edu>

Author: evancheng
Date: Fri Aug  8 03:12:06 2008
New Revision: 54524

URL: http://llvm.org/viewvc/llvm-project?rev=54524&view=rev
Log:
Add -fast command line option to lli. It enables fast codegen path.

Modified:
    llvm/trunk/tools/lli/lli.cpp

Modified: llvm/trunk/tools/lli/lli.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=54524&r1=54523&r2=54524&view=diff

==============================================================================
--- llvm/trunk/tools/lli/lli.cpp (original)
+++ llvm/trunk/tools/lli/lli.cpp Fri Aug  8 03:12:06 2008
@@ -41,6 +41,12 @@
   cl::opt ForceInterpreter("force-interpreter",
                                  cl::desc("Force interpretation: disable JIT"),
                                  cl::init(false));
+
+  cl::opt Fast("fast", 
+                     cl::desc("Generate code quickly, "
+                              "potentially sacrificing code quality"),
+                     cl::init(false));
+
   cl::opt
   TargetTriple("mtriple", cl::desc("Override target triple for module"));
   
@@ -106,7 +112,7 @@
   if (!TargetTriple.empty())
     Mod->setTargetTriple(TargetTriple);
 
-  EE = ExecutionEngine::create(MP, ForceInterpreter, &ErrorMsg);
+  EE = ExecutionEngine::create(MP, ForceInterpreter, &ErrorMsg, Fast);
   if (!EE && !ErrorMsg.empty()) {
     std::cerr << argv[0] << ":error creating EE: " << ErrorMsg << "\n";
     exit(1);




From asl at math.spbu.ru  Fri Aug  8 05:03:02 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 14:03:02 +0400
Subject: [llvm-commits] [llvm] r54519 - in
	/llvm/trunk:	include/llvm/Target/DarwinTargetAsmInfo.h	include/llvm/Target/ELFTargetAsmInfo.h
	include/llvm/Target/TargetAsmInfo.h	lib/Target/ARM/ARMAsmPrinter.cpp
	lib/Target/DarwinTargetAsmInfo.cpp	lib/Target/ELFTargetAsmInfo.cpp
	lib/Target/Mips/MipsTargetAsmInfo.cpp	lib/Target/Mips/MipsTargetAsmInfo.h
	lib/Target/TargetAsmInfo.cpp	test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll
In-Reply-To: <200808080656.m786uHPq002844@zion.cs.uiuc.edu>
References: <200808080656.m786uHPq002844@zion.cs.uiuc.edu>
Message-ID: <1218189782.31128.61.camel@localhost>

Hi, Evan

> +    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
> +                                                 bool NoCoalesce = false) const;
This approach seems to be pretty hackish and definitely cannot be
solution here, since it adds target-specific stuff (coalesced sections)
into generic interface. Could you please provide a C testcase, I'll try
to see how mainline gcc (from iPhone SDK) deals with this problem and
fix the stuff properly.

-- 
With best regards, Anton Korobeynikov.

Faculty of Mathematics & Mechanics, Saint Petersburg State University.




From sabre at nondot.org  Fri Aug  8 10:14:12 2008
From: sabre at nondot.org (Chris Lattner)
Date: Fri, 08 Aug 2008 15:14:12 -0000
Subject: [llvm-commits] [llvm] r54528 - in /llvm/trunk:
 include/llvm/PassManagers.h lib/Analysis/IPA/CallGraphSCCPass.cpp
 lib/Analysis/LoopPass.cpp lib/VMCore/PassManager.cpp
Message-ID: <200808081514.m78FEDRM001478@zion.cs.uiuc.edu>

Author: lattner
Date: Fri Aug  8 10:14:09 2008
New Revision: 54528

URL: http://llvm.org/viewvc/llvm-project?rev=54528&view=rev
Log:
Don't call getAnalysisUsage unless -debug-pass is enabled.  This speeds
up the passmgr by avoiding useless work.

Modified:
    llvm/trunk/include/llvm/PassManagers.h
    llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp
    llvm/trunk/lib/Analysis/LoopPass.cpp
    llvm/trunk/lib/VMCore/PassManager.cpp

Modified: llvm/trunk/include/llvm/PassManagers.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassManagers.h?rev=54528&r1=54527&r2=54528&view=diff

==============================================================================
--- llvm/trunk/include/llvm/PassManagers.h (original)
+++ llvm/trunk/include/llvm/PassManagers.h Fri Aug  8 10:14:09 2008
@@ -308,8 +308,8 @@
   void dumpPassArguments() const;
   void dumpPassInfo(Pass *P, enum PassDebuggingString S1,
                     enum PassDebuggingString S2, const char *Msg);
-  void dumpAnalysisSetInfo(const char *Msg, Pass *P,
-                           const AnalysisUsage::VectorType &Set) const;
+  void dumpRequiredSet(const Pass *P) const;
+  void dumpPreservedSet(const Pass *P) const;
 
   virtual unsigned getNumContainedPasses() const {
     return (unsigned)PassVector.size();
@@ -346,6 +346,9 @@
   std::map *InheritedAnalysis[PMT_Last];
 
 private:
+  void dumpAnalysisUsage(const char *Msg, const Pass *P,
+                           const AnalysisUsage::VectorType &Set) const;
+
   // Set of available Analysis. This information is used while scheduling 
   // pass. If a pass requires an analysis which is not not available then 
   // equired analysis pass is scheduled to run before the pass itself is 

Modified: llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp?rev=54528&r1=54527&r2=54528&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp (original)
+++ llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp Fri Aug  8 10:14:09 2008
@@ -91,11 +91,9 @@
     // Run all passes on current SCC
     for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
       Pass *P = getContainedPass(Index);
-      AnalysisUsage AnUsage;
-      P->getAnalysisUsage(AnUsage);
 
       dumpPassInfo(P, EXECUTION_MSG, ON_CG_MSG, "");
-      dumpAnalysisSetInfo("Required", P, AnUsage.getRequiredSet());
+      dumpRequiredSet(P);
 
       initializeAnalysisImpl(P);
 
@@ -120,7 +118,7 @@
 
       if (Changed)
         dumpPassInfo(P, MODIFICATION_MSG, ON_CG_MSG, "");
-      dumpAnalysisSetInfo("Preserved", P, AnUsage.getPreservedSet());
+      dumpPreservedSet(P);
 
       verifyPreservedAnalysis(P);      
       removeNotPreservedAnalysis(P);

Modified: llvm/trunk/lib/Analysis/LoopPass.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoopPass.cpp?rev=54528&r1=54527&r2=54528&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/LoopPass.cpp (original)
+++ llvm/trunk/lib/Analysis/LoopPass.cpp Fri Aug  8 10:14:09 2008
@@ -214,11 +214,9 @@
     for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {  
         
       Pass *P = getContainedPass(Index);
-      AnalysisUsage AnUsage;
-      P->getAnalysisUsage(AnUsage);
 
       dumpPassInfo(P, EXECUTION_MSG, ON_LOOP_MSG, "");
-      dumpAnalysisSetInfo("Required", P, AnUsage.getRequiredSet());
+      dumpRequiredSet(P);
 
       initializeAnalysisImpl(P);
 
@@ -230,7 +228,7 @@
 
       if (Changed)
         dumpPassInfo(P, MODIFICATION_MSG, ON_LOOP_MSG, "");
-      dumpAnalysisSetInfo("Preserved", P, AnUsage.getPreservedSet());
+      dumpPreservedSet(P);
 
       verifyPreservedAnalysis(LP);
       removeNotPreservedAnalysis(P);

Modified: llvm/trunk/lib/VMCore/PassManager.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/PassManager.cpp?rev=54528&r1=54527&r2=54528&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/PassManager.cpp (original)
+++ llvm/trunk/lib/VMCore/PassManager.cpp Fri Aug  8 10:14:09 2008
@@ -954,17 +954,38 @@
   }
 }
 
-void PMDataManager::dumpAnalysisSetInfo(const char *Msg, Pass *P,
+void PMDataManager::dumpRequiredSet(const Pass *P)
+  const {
+  if (PassDebugging < Details)
+    return;
+    
+  AnalysisUsage analysisUsage;
+  P->getAnalysisUsage(analysisUsage);
+  dumpAnalysisUsage("Required", P, analysisUsage.getRequiredSet());
+}
+
+void PMDataManager::dumpPreservedSet(const Pass *P)
+  const {
+  if (PassDebugging < Details)
+    return;
+    
+  AnalysisUsage analysisUsage;
+  P->getAnalysisUsage(analysisUsage);
+  dumpAnalysisUsage("Preserved", P, analysisUsage.getPreservedSet());
+}
+
+void PMDataManager::dumpAnalysisUsage(const char *Msg, const Pass *P,
                                         const AnalysisUsage::VectorType &Set)
   const {
-  if (PassDebugging >= Details && !Set.empty()) {
-    cerr << (void*)P << std::string(getDepth()*2+3, ' ') << Msg << " Analyses:";
-      for (unsigned i = 0; i != Set.size(); ++i) {
-        if (i) cerr << ",";
-        cerr << " " << Set[i]->getPassName();
-      }
-      cerr << "\n";
-  }
+  assert(PassDebugging >= Details);
+  if (Set.empty())
+    return;
+  cerr << (void*)P << std::string(getDepth()*2+3, ' ') << Msg << " Analyses:";
+    for (unsigned i = 0; i != Set.size(); ++i) {
+      if (i) cerr << ",";
+      cerr << " " << Set[i]->getPassName();
+    }
+    cerr << "\n";
 }
 
 /// Add RequiredPass into list of lower level passes required by pass P.
@@ -1031,11 +1052,9 @@
   for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I)
     for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
       BasicBlockPass *BP = getContainedPass(Index);
-      AnalysisUsage AnUsage;
-      BP->getAnalysisUsage(AnUsage);
 
       dumpPassInfo(BP, EXECUTION_MSG, ON_BASICBLOCK_MSG, I->getNameStart());
-      dumpAnalysisSetInfo("Required", BP, AnUsage.getRequiredSet());
+      dumpRequiredSet(BP);
 
       initializeAnalysisImpl(BP);
 
@@ -1046,7 +1065,7 @@
       if (Changed) 
         dumpPassInfo(BP, MODIFICATION_MSG, ON_BASICBLOCK_MSG,
                      I->getNameStart());
-      dumpAnalysisSetInfo("Preserved", BP, AnUsage.getPreservedSet());
+      dumpPreservedSet(BP);
 
       verifyPreservedAnalysis(BP);
       removeNotPreservedAnalysis(BP);
@@ -1232,11 +1251,8 @@
   for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
     FunctionPass *FP = getContainedPass(Index);
 
-    AnalysisUsage AnUsage;
-    FP->getAnalysisUsage(AnUsage);
-
     dumpPassInfo(FP, EXECUTION_MSG, ON_FUNCTION_MSG, F.getNameStart());
-    dumpAnalysisSetInfo("Required", FP, AnUsage.getRequiredSet());
+    dumpRequiredSet(FP);
 
     initializeAnalysisImpl(FP);
 
@@ -1246,7 +1262,7 @@
 
     if (Changed) 
       dumpPassInfo(FP, MODIFICATION_MSG, ON_FUNCTION_MSG, F.getNameStart());
-    dumpAnalysisSetInfo("Preserved", FP, AnUsage.getPreservedSet());
+    dumpPreservedSet(FP);
 
     verifyPreservedAnalysis(FP);
     removeNotPreservedAnalysis(FP);
@@ -1304,12 +1320,9 @@
   for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) {
     ModulePass *MP = getContainedPass(Index);
 
-    AnalysisUsage AnUsage;
-    MP->getAnalysisUsage(AnUsage);
-
     dumpPassInfo(MP, EXECUTION_MSG, ON_MODULE_MSG,
                  M.getModuleIdentifier().c_str());
-    dumpAnalysisSetInfo("Required", MP, AnUsage.getRequiredSet());
+    dumpRequiredSet(MP);
 
     initializeAnalysisImpl(MP);
 
@@ -1320,7 +1333,7 @@
     if (Changed) 
       dumpPassInfo(MP, MODIFICATION_MSG, ON_MODULE_MSG,
                    M.getModuleIdentifier().c_str());
-    dumpAnalysisSetInfo("Preserved", MP, AnUsage.getPreservedSet());
+    dumpPreservedSet(MP);
     
     verifyPreservedAnalysis(MP);
     removeNotPreservedAnalysis(MP);




From evan.cheng at apple.com  Fri Aug  8 10:38:27 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 8 Aug 2008 08:38:27 -0700
Subject: [llvm-commits] [llvm] r54519 - in	/llvm/trunk:
	include/llvm/Target/DarwinTargetAsmInfo.h
	include/llvm/Target/ELFTargetAsmInfo.h	include/llvm/Target/TargetAsmInfo.h
	lib/Target/ARM/ARMAsmPrinter.cpp	lib/Target/DarwinTargetAsmInfo.cpp
	lib/Target/ELFTargetAsmInfo.cpp	lib/Target/Mips/MipsTargetAsmInfo.cpp
	lib/Target/Mips/MipsTargetAsmInfo.h	lib/Target/TargetAsmInfo.cpp
	test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll
In-Reply-To: <1218189782.31128.61.camel@localhost>
References: <200808080656.m786uHPq002844@zion.cs.uiuc.edu>
	<1218189782.31128.61.camel@localhost>
Message-ID: <5920B5CE-7F21-49DC-A968-4EE2C7993A74@apple.com>

Yeah, I realized I over-thought the problem after I went to bed:

struct x {
   int a;
   int b;
} X  __attribute__((weak)) = { 1, 2 };

void set(int b) {
   X.b = b;
}

All the extra logic is not needed since the PIC relative expression is  
using GV stub. Feel free to undo my patch (except the ARMAsmPrinter  
part the choose lcomm instead of comm). Or I will get to it later today.

Evan

On Aug 8, 2008, at 3:03 AM, Anton Korobeynikov wrote:

> Hi, Evan
>
>> +    virtual const Section* SelectSectionForGlobal(const  
>> GlobalValue *GV,
>> +                                                 bool NoCoalesce =  
>> false) const;
> This approach seems to be pretty hackish and definitely cannot be
> solution here, since it adds target-specific stuff (coalesced  
> sections)
> into generic interface. Could you please provide a C testcase, I'll  
> try
> to see how mainline gcc (from iPhone SDK) deals with this problem and
> fix the stuff properly.
>
> -- 
> With best regards, Anton Korobeynikov.
>
> Faculty of Mathematics & Mechanics, Saint Petersburg State University.
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From asl at math.spbu.ru  Fri Aug  8 10:44:09 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 19:44:09 +0400
Subject: [llvm-commits] [llvm] r54519 -
	in	/llvm/trunk:	include/llvm/Target/DarwinTargetAsmInfo.h	include/llvm/Target/ELFTargetAsmInfo.h	include/llvm/Target/TargetAsmInfo.h	lib/Target/ARM/ARMAsmPrinter.cpp	lib/Target/DarwinTargetAsmInfo.cpp	lib/Target/ELFTargetAsmInfo.cpp	lib/Target/Mips/MipsTargetAsmInfo.cpp	lib/Target/Mips/MipsTargetAsmInfo.h	lib/Target/TargetAsmInfo.cpp	test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll
In-Reply-To: <5920B5CE-7F21-49DC-A968-4EE2C7993A74.SS1247SS@apple.com>
References: <200808080656.m786uHPq002844@zion.cs.uiuc.edu>
	<1218189782.31128.61.camel@localhost>
	<5920B5CE-7F21-49DC-A968-4EE2C7993A74.SS1247SS@apple.com>
Message-ID: <1218210249.31128.81.camel@localhost>

Hello, Evan

> All the extra logic is not needed since the PIC relative expression is  
> using GV stub. Feel free to undo my patch (except the ARMAsmPrinter  
> part the choose lcomm instead of comm). Or I will get to it later today.
Ok, will undo. I'm also preparing a series of patches to generalize
uninitialized stuff handling, so hopefully all those comm/lcomm dances
will be handled with all generality.

-- 
With best regards, Anton Korobeynikov.

Faculty of Mathematics & Mechanics, Saint Petersburg State University.




From isanbard at gmail.com  Fri Aug  8 12:23:36 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 17:23:36 -0000
Subject: [llvm-commits] [llvm] r54531 - /llvm/tags/Apple/llvmCore-2063/
Message-ID: <200808081723.m78HNaS8006943@zion.cs.uiuc.edu>

Author: void
Date: Fri Aug  8 12:23:36 2008
New Revision: 54531

URL: http://llvm.org/viewvc/llvm-project?rev=54531&view=rev
Log:
Creating llvmCore-2063 branch

Added:
    llvm/tags/Apple/llvmCore-2063/
      - copied from r54530, llvm/trunk/



From isanbard at gmail.com  Fri Aug  8 12:23:43 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 08 Aug 2008 17:23:43 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54532 -
	/llvm-gcc-4.2/tags/Apple/llvmgcc42-2063/
Message-ID: <200808081723.m78HNhrv006958@zion.cs.uiuc.edu>

Author: void
Date: Fri Aug  8 12:23:43 2008
New Revision: 54532

URL: http://llvm.org/viewvc/llvm-project?rev=54532&view=rev
Log:
Creating llvmgcc42-2063 branch

Added:
    llvm-gcc-4.2/tags/Apple/llvmgcc42-2063/
      - copied from r54531, llvm-gcc-4.2/trunk/



From evan.cheng at apple.com  Fri Aug  8 12:56:50 2008
From: evan.cheng at apple.com (Evan Cheng)
Date: Fri, 08 Aug 2008 17:56:50 -0000
Subject: [llvm-commits] [llvm] r54534 - in /llvm/trunk:
 include/llvm/Target/DarwinTargetAsmInfo.h
 include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h
 lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/DarwinTargetAsmInfo.cpp
 lib/Target/ELFTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.cpp
 lib/Target/Mips/MipsTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp
Message-ID: <200808081756.m78Hupot008337@zion.cs.uiuc.edu>

Author: evancheng
Date: Fri Aug  8 12:56:50 2008
New Revision: 54534

URL: http://llvm.org/viewvc/llvm-project?rev=54534&view=rev
Log:
Undo most of r54519.

Modified:
    llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
    llvm/trunk/include/llvm/Target/TargetAsmInfo.h
    llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
    llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
    llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
    llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
    llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h
    llvm/trunk/lib/Target/TargetAsmInfo.cpp

Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Fri Aug  8 12:56:50 2008
@@ -30,8 +30,7 @@
     const Section* DataCoalSection;
 
     explicit DarwinTargetAsmInfo(const TargetMachine &TM);
-    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
-                                                 bool NoCoalesce = false) const;
+    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
     virtual std::string UniqueSectionForGlobal(const GlobalValue* GV,
                                                SectionKind::Kind kind) const;
     const Section* MergeableConstSection(const GlobalVariable *GV) const;

Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h Fri Aug  8 12:56:50 2008
@@ -26,8 +26,7 @@
   struct ELFTargetAsmInfo: public virtual TargetAsmInfo {
     explicit ELFTargetAsmInfo(const TargetMachine &TM);
 
-    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
-                                                 bool NoCoalesce = false) const;
+    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
     virtual std::string PrintSectionFlags(unsigned flags) const;
     const Section* MergeableConstSection(const GlobalVariable *GV) const;
     inline const Section* MergeableConstSection(const Type *Ty) const;

Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original)
+++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Fri Aug  8 12:56:50 2008
@@ -544,10 +544,8 @@
                           const char* name = NULL) const;
 
     /// SectionForGlobal - This hooks returns proper section name for given
-    /// global with all necessary flags and marks. If NoCoalesce is true,
-    /// do not use coalesced section.
-    virtual std::string SectionForGlobal(const GlobalValue *GV,
-                                         bool NoCoalesce = false) const;
+    /// global with all necessary flags and marks.
+    virtual std::string SectionForGlobal(const GlobalValue *GV) const;
 
     // Helper methods for SectionForGlobal
     virtual std::string UniqueSectionForGlobal(const GlobalValue* GV,
@@ -555,8 +553,7 @@
 
     virtual std::string PrintSectionFlags(unsigned flags) const { return ""; }
 
-    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
-                                                 bool NoCoalesce = false) const;
+    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
 
     virtual const Section* SelectSectionForMachineConst(const Type *Ty) const;
 

Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Fri Aug  8 12:56:50 2008
@@ -863,8 +863,7 @@
     return;
   }
 
-  bool NoCoalesc = PCRelGVs.count(GVar);
-  std::string SectionName = TAI->SectionForGlobal(GVar, NoCoalesc);
+  std::string SectionName = TAI->SectionForGlobal(GVar);
   std::string name = Mang->getValueName(GVar);
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();
@@ -901,7 +900,7 @@
       if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
 
       if (TAI->getLCOMMDirective() != NULL) {
-        if (NoCoalesc || GVar->hasInternalLinkage()) {
+        if (PCRelGVs.count(GVar) || GVar->hasInternalLinkage()) {
           O << TAI->getLCOMMDirective() << name << "," << Size;
           if (Subtarget->isTargetDarwin())
             O << "," << Align;

Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Fri Aug  8 12:56:50 2008
@@ -51,15 +51,14 @@
 }
 
 const Section*
-DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
-                                            bool NoCoalesce) const {
+DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
   SectionKind::Kind Kind = SectionKindForGlobal(GV);
-  bool CanCoalesce = !NoCoalesce && GV->isWeakForLinker();
+  bool isWeak = GV->isWeakForLinker();
   bool isNonStatic = (DTM->getRelocationModel() != Reloc::Static);
 
   switch (Kind) {
    case SectionKind::Text:
-    if (CanCoalesce)
+    if (isWeak)
       return TextCoalSection;
     else
       return getTextSection_();
@@ -68,18 +67,18 @@
    case SectionKind::BSS:
    case SectionKind::ThreadBSS:
     if (cast(GV)->isConstant())
-      return (CanCoalesce ? ConstDataCoalSection : ConstDataSection);
+      return (isWeak ? ConstDataCoalSection : ConstDataSection);
     else
-      return (CanCoalesce ? DataCoalSection : getDataSection_());
+      return (isWeak ? DataCoalSection : getDataSection_());
    case SectionKind::ROData:
-    return (CanCoalesce ? ConstDataCoalSection :
+    return (isWeak ? ConstDataCoalSection :
             (isNonStatic ? ConstDataSection : getReadOnlySection_()));
    case SectionKind::RODataMergeStr:
-    return (CanCoalesce ?
+    return (isWeak ?
             ConstDataCoalSection :
             MergeableStringSection(cast(GV)));
    case SectionKind::RODataMergeConst:
-    return (CanCoalesce ?
+    return (isWeak ?
             ConstDataCoalSection:
             MergeableConstSection(cast(GV)));
    default:

Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Fri Aug  8 12:56:50 2008
@@ -40,8 +40,7 @@
 }
 
 const Section*
-ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
-                                         bool NoCoalesce) const {
+ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
   SectionKind::Kind Kind = SectionKindForGlobal(GV);
 
   if (const Function *F = dyn_cast(GV)) {

Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp Fri Aug  8 12:56:50 2008
@@ -82,7 +82,7 @@
 }
 
 const Section* MipsTargetAsmInfo::
-SelectSectionForGlobal(const GlobalValue *GV, bool NoCoalesce) const {
+SelectSectionForGlobal(const GlobalValue *GV) const {
   SectionKind::Kind K = SectionKindForGlobal(GV);
   const GlobalVariable *GVA = dyn_cast(GV);
 

Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h Fri Aug  8 12:56:50 2008
@@ -40,8 +40,7 @@
     SectionFlagsForGlobal(const GlobalValue *GV = NULL,
                           const char* name = NULL) const;
 
-    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV,
-                                                  bool NoCoalesce) const;
+    virtual const Section* SelectSectionForGlobal(const GlobalValue *GV) const;
 
     private:
       const MipsSubtarget *Subtarget;

Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=54534&r1=54533&r2=54534&view=diff

==============================================================================
--- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Fri Aug  8 12:56:50 2008
@@ -272,7 +272,7 @@
 }
 
 std::string
-TargetAsmInfo::SectionForGlobal(const GlobalValue *GV, bool NoCoalesce) const {
+TargetAsmInfo::SectionForGlobal(const GlobalValue *GV) const {
   const Section* S;
   // Select section name
   if (GV->hasSection()) {
@@ -282,7 +282,7 @@
     S = getNamedSection(GV->getSection().c_str(), Flags);
   } else {
     // Use default section depending on the 'type' of global
-    S = SelectSectionForGlobal(GV, NoCoalesce);
+    S = SelectSectionForGlobal(GV);
   }
 
   if (!S->isNamed())
@@ -295,8 +295,8 @@
 }
 
 // Lame default implementation. Calculate the section name for global.
-const Section* TargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV,
-                                                     bool NoCoalesce) const {
+const Section*
+TargetAsmInfo::SelectSectionForGlobal(const GlobalValue *GV) const {
   SectionKind::Kind Kind = SectionKindForGlobal(GV);
 
   if (GV->isWeakForLinker()) {




From resistor at mac.com  Fri Aug  8 13:00:06 2008
From: resistor at mac.com (Owen Anderson)
Date: Fri, 08 Aug 2008 18:00:06 -0000
Subject: [llvm-commits] [llvm] r54535 -
	/llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp
Message-ID: <200808081800.m78I063W008466@zion.cs.uiuc.edu>

Author: resistor
Date: Fri Aug  8 13:00:05 2008
New Revision: 54535

URL: http://llvm.org/viewvc/llvm-project?rev=54535&view=rev
Log:
Reduce the entries in a phi before testing it for deadness, because removing the entries might make it dead.

Modified:
    llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp

Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp?rev=54535&r1=54534&r2=54535&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp (original)
+++ llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Fri Aug  8 13:00:05 2008
@@ -152,6 +152,12 @@
     MachineBasicBlock::iterator phi = BB->begin();
     while (phi != BB->end() &&
            phi->getOpcode() == TargetInstrInfo::PHI) {
+      for (unsigned i = phi->getNumOperands() - 1; i >= 2; i-=2)
+        if (!preds.count(phi->getOperand(i).getMBB())) {
+          phi->RemoveOperand(i);
+          phi->RemoveOperand(i-1);
+        }
+      
       if (phi->getNumOperands() == 3) {
         unsigned Input = phi->getOperand(1).getReg();
         unsigned Output = phi->getOperand(0).getReg();
@@ -162,15 +168,9 @@
 
         if (Input != Output)
           F.getRegInfo().replaceRegWith(Output, Input);
-        
+
         continue;
       }
-      
-      for (unsigned i = phi->getNumOperands() - 1; i >= 2; i-=2)
-        if (!preds.count(phi->getOperand(i).getMBB())) {
-          phi->RemoveOperand(i);
-          phi->RemoveOperand(i-1);
-        }
   
       ++phi;
     }




From asl at math.spbu.ru  Fri Aug  8 13:23:00 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 18:23:00 -0000
Subject: [llvm-commits] [llvm] r54536 -
	/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
Message-ID: <200808081823.m78IN0gY009491@zion.cs.uiuc.edu>

Author: asl
Date: Fri Aug  8 13:22:59 2008
New Revision: 54536

URL: http://llvm.org/viewvc/llvm-project?rev=54536&view=rev
Log:
Cleanup

Modified:
    llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp

Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54536&r1=54535&r2=54536&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug  8 13:22:59 2008
@@ -87,7 +87,7 @@
 
     void printMachineInstruction(const MachineInstr *MI);
     void printOp(const MachineOperand &MO);
-    
+
     /// stripRegisterPrefix - This method strips the character prefix from a
     /// register name so that only the number is left.  Used by for linux asm.
     const char *stripRegisterPrefix(const char *RegName) {
@@ -97,22 +97,22 @@
       case 'v': return RegName + 1;
       case 'c': if (RegName[1] == 'r') return RegName + 2;
       }
-       
+
       return RegName;
     }
-    
+
     /// printRegister - Print register according to target requirements.
     ///
     void printRegister(const MachineOperand &MO, bool R0AsZero) {
       unsigned RegNo = MO.getReg();
       assert(TargetRegisterInfo::isPhysicalRegister(RegNo) && "Not physreg??");
-      
+
       // If we should use 0 for R0.
       if (R0AsZero && RegNo == PPC::R0) {
         O << "0";
         return;
       }
-      
+
       const char *RegName = TM.getRegisterInfo()->get(RegNo).AsmName;
       // Linux assembler (Others?) does not take register mnemonics.
       // FIXME - What about special registers used in mfspr/mtspr?
@@ -130,13 +130,13 @@
         printOp(MO);
       }
     }
-    
+
     bool PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
                          unsigned AsmVariant, const char *ExtraCode);
     bool PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
                                unsigned AsmVariant, const char *ExtraCode);
-    
-    
+
+
     void printS5ImmOperand(const MachineInstr *MI, unsigned OpNo) {
       char value = MI->getOperand(OpNo).getImm();
       value = (value << (32-5)) >> (32-5);
@@ -202,7 +202,7 @@
           return;
         }
       }
-      
+
       printOp(MI->getOperand(OpNo));
     }
     void printAbsAddrOperand(const MachineInstr *MI, unsigned OpNo) {
@@ -249,7 +249,7 @@
     void printMemRegImm(const MachineInstr *MI, unsigned OpNo) {
       printSymbolLo(MI, OpNo);
       O << '(';
-      if (MI->getOperand(OpNo+1).isRegister() && 
+      if (MI->getOperand(OpNo+1).isRegister() &&
           MI->getOperand(OpNo+1).getReg() == PPC::R0)
         O << "0";
       else
@@ -259,17 +259,17 @@
     void printMemRegImmShifted(const MachineInstr *MI, unsigned OpNo) {
       if (MI->getOperand(OpNo).isImmediate())
         printS16X4ImmOperand(MI, OpNo);
-      else 
+      else
         printSymbolLo(MI, OpNo);
       O << '(';
-      if (MI->getOperand(OpNo+1).isRegister() && 
+      if (MI->getOperand(OpNo+1).isRegister() &&
           MI->getOperand(OpNo+1).getReg() == PPC::R0)
         O << "0";
       else
         printOperand(MI, OpNo+1);
       O << ')';
     }
-    
+
     void printMemRegReg(const MachineInstr *MI, unsigned OpNo) {
       // When used as the base register, r0 reads constant zero rather than
       // the value contained in the register.  For this reason, the darwin
@@ -279,23 +279,23 @@
       O << ", ";
       printOperand(MI, OpNo+1);
     }
-    
-    void printPredicateOperand(const MachineInstr *MI, unsigned OpNo, 
+
+    void printPredicateOperand(const MachineInstr *MI, unsigned OpNo,
                                const char *Modifier);
-    
+
     virtual bool runOnMachineFunction(MachineFunction &F) = 0;
     virtual bool doFinalization(Module &M) = 0;
 
     virtual void EmitExternalGlobal(const GlobalVariable *GV);
   };
 
-  /// LinuxAsmPrinter - PowerPC assembly printer, customized for Linux
-  struct VISIBILITY_HIDDEN LinuxAsmPrinter : public PPCAsmPrinter {
+  /// PPCLinuxAsmPrinter - PowerPC assembly printer, customized for Linux
+  struct VISIBILITY_HIDDEN PPCLinuxAsmPrinter : public PPCAsmPrinter {
 
     DwarfWriter DW;
     MachineModuleInfo *MMI;
 
-    LinuxAsmPrinter(std::ostream &O, PPCTargetMachine &TM,
+    PPCLinuxAsmPrinter(std::ostream &O, PPCTargetMachine &TM,
                     const TargetAsmInfo *T)
       : PPCAsmPrinter(O, TM, T), DW(O, this, T), MMI(0) {
     }
@@ -307,7 +307,7 @@
     bool runOnMachineFunction(MachineFunction &F);
     bool doInitialization(Module &M);
     bool doFinalization(Module &M);
-    
+
     void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesAll();
       AU.addRequired();
@@ -319,26 +319,26 @@
     virtual std::string getSectionForFunction(const Function &F) const;
   };
 
-  /// DarwinAsmPrinter - PowerPC assembly printer, customized for Darwin/Mac OS
-  /// X
-  struct VISIBILITY_HIDDEN DarwinAsmPrinter : public PPCAsmPrinter {
-  
+  /// PPCDarwinAsmPrinter - PowerPC assembly printer, customized for Darwin/Mac
+  /// OS X
+  struct VISIBILITY_HIDDEN PPCDarwinAsmPrinter : public PPCAsmPrinter {
+
     DwarfWriter DW;
     MachineModuleInfo *MMI;
 
-    DarwinAsmPrinter(std::ostream &O, PPCTargetMachine &TM,
-                     const TargetAsmInfo *T)
+    PPCDarwinAsmPrinter(std::ostream &O, PPCTargetMachine &TM,
+                        const TargetAsmInfo *T)
       : PPCAsmPrinter(O, TM, T), DW(O, this, T), MMI(0) {
     }
 
     virtual const char *getPassName() const {
       return "Darwin PPC Assembly Printer";
     }
-    
+
     bool runOnMachineFunction(MachineFunction &F);
     bool doInitialization(Module &M);
     bool doFinalization(Module &M);
-    
+
     void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesAll();
       AU.addRequired();
@@ -400,12 +400,12 @@
       }
     }
     O << Name;
-    
+
     if (MO.getOffset() > 0)
       O << "+" << MO.getOffset();
     else if (MO.getOffset() < 0)
       O << MO.getOffset();
-    
+
     if (GV->hasExternalWeakLinkage())
       ExtWeakSymbols.insert(GV);
     return;
@@ -432,19 +432,19 @@
 /// PrintAsmOperand - Print out an operand for an inline asm expression.
 ///
 bool PPCAsmPrinter::PrintAsmOperand(const MachineInstr *MI, unsigned OpNo,
-                                    unsigned AsmVariant, 
+                                    unsigned AsmVariant,
                                     const char *ExtraCode) {
   // Does this asm operand have a single letter operand modifier?
   if (ExtraCode && ExtraCode[0]) {
     if (ExtraCode[1] != 0) return true; // Unknown modifier.
-    
+
     switch (ExtraCode[0]) {
     default: return true;  // Unknown modifier.
     case 'c': // Don't print "$" before a global var name or constant.
       // PPC never has a prefix.
       printOperand(MI, OpNo);
       return false;
-    case 'L': // Write second word of DImode reference.  
+    case 'L': // Write second word of DImode reference.
       // Verify that this operand has two consecutive registers.
       if (!MI->getOperand(OpNo).isRegister() ||
           OpNo+1 == MI->getNumOperands() ||
@@ -460,13 +460,13 @@
       return false;
     }
   }
-  
+
   printOperand(MI, OpNo);
   return false;
 }
 
 bool PPCAsmPrinter::PrintAsmMemoryOperand(const MachineInstr *MI, unsigned OpNo,
-                                          unsigned AsmVariant, 
+                                          unsigned AsmVariant,
                                           const char *ExtraCode) {
   if (ExtraCode && ExtraCode[0])
     return true; // Unknown modifier.
@@ -477,7 +477,7 @@
   return false;
 }
 
-void PPCAsmPrinter::printPredicateOperand(const MachineInstr *MI, unsigned OpNo, 
+void PPCAsmPrinter::printPredicateOperand(const MachineInstr *MI, unsigned OpNo,
                                           const char *Modifier) {
   assert(Modifier && "Must specify 'cc' or 'reg' as predicate op modifier!");
   unsigned Code = MI->getOperand(OpNo).getImm();
@@ -493,7 +493,7 @@
     case PPC::PRED_UN: O << "un"; return;
     case PPC::PRED_NU: O << "nu"; return;
     }
-      
+
   } else {
     assert(!strcmp(Modifier, "reg") &&
            "Need to specify 'cc' or 'reg' as predicate op modifier!");
@@ -564,18 +564,18 @@
 /// runOnMachineFunction - This uses the printMachineInstruction()
 /// method to print assembly for each instruction.
 ///
-bool LinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
+bool PPCLinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
 
   SetupMachineFunction(MF);
   O << "\n\n";
-  
+
   // Print out constants referenced by the function
   EmitConstantPool(MF.getConstantPool());
 
   // Print out labels for the function.
   const Function *F = MF.getFunction();
   SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
-  
+
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");
   case Function::InternalLinkage:  // Symbols default to internal.
@@ -590,11 +590,11 @@
     O << "\t.weak\t" << CurrentFnName << '\n';
     break;
   }
-  
+
   if (F->hasHiddenVisibility())
     if (const char *Directive = TAI->getHiddenDirective())
       O << Directive << CurrentFnName << "\n";
-  
+
   EmitAlignment(2, F);
   O << CurrentFnName << ":\n";
 
@@ -620,17 +620,17 @@
 
   // Print out jump tables referenced by the function.
   EmitJumpTableInfo(MF.getJumpTableInfo(), MF);
-  
+
   // Emit post-function debug information.
   DW.EndFunction();
-  
+
   // We didn't modify anything.
   return false;
 }
 
-bool LinuxAsmPrinter::doInitialization(Module &M) {
+bool PPCLinuxAsmPrinter::doInitialization(Module &M) {
   bool Result = AsmPrinter::doInitialization(M);
-  
+
   // Emit initial debug information.
   DW.BeginModule(&M);
 
@@ -643,7 +643,7 @@
   Mang->setUseQuotes(true);
 
   SwitchToTextSection(TAI->getTextSection());
-  
+
   return Result;
 }
 
@@ -656,14 +656,14 @@
       OS << *Name;
 }
 
-bool LinuxAsmPrinter::doFinalization(Module &M) {
+bool PPCLinuxAsmPrinter::doFinalization(Module &M) {
   const TargetData *TD = TM.getTargetData();
 
   // Print out module-level global variables here.
   for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
        I != E; ++I) {
     if (!I->hasInitializer()) continue;   // External global require no code
-    
+
     // Check to see if this is a special global used by LLVM, if so, emit it.
     if (EmitSpecialLLVMGlobal(I))
       continue;
@@ -673,7 +673,7 @@
     if (I->hasHiddenVisibility())
       if (const char *Directive = TAI->getHiddenDirective())
         O << Directive << name << "\n";
-    
+
     Constant *C = I->getInitializer();
     unsigned Size = TD->getABITypeSize(C->getType());
     unsigned Align = TD->getPreferredAlignmentLog(I);
@@ -770,7 +770,7 @@
   return AsmPrinter::doFinalization(M);
 }
 
-std::string LinuxAsmPrinter::getSectionForFunction(const Function &F) const {
+std::string PPCLinuxAsmPrinter::getSectionForFunction(const Function &F) const {
   switch (F.getLinkage()) {
   default: assert(0 && "Unknown linkage type!");
   case Function::ExternalLinkage:
@@ -781,7 +781,7 @@
   }
 }
 
-std::string DarwinAsmPrinter::getSectionForFunction(const Function &F) const {
+std::string PPCDarwinAsmPrinter::getSectionForFunction(const Function &F) const {
   switch (F.getLinkage()) {
   default: assert(0 && "Unknown linkage type!");
   case Function::ExternalLinkage:
@@ -795,7 +795,7 @@
 /// runOnMachineFunction - This uses the printMachineInstruction()
 /// method to print assembly for each instruction.
 ///
-bool DarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
+bool PPCDarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
 
   SetupMachineFunction(MF);
   O << "\n\n";
@@ -806,7 +806,7 @@
   // Print out labels for the function.
   const Function *F = MF.getFunction();
   SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
-  
+
   switch (F->getLinkage()) {
   default: assert(0 && "Unknown linkage type!");
   case Function::InternalLinkage:  // Symbols default to internal.
@@ -820,11 +820,11 @@
     O << "\t.weak_definition\t" << CurrentFnName << "\n";
     break;
   }
-  
+
   if (F->hasHiddenVisibility())
     if (const char *Directive = TAI->getHiddenDirective())
       O << Directive << CurrentFnName << "\n";
-  
+
   EmitAlignment(OptimizeForSize ? 2 : 4, F);
   O << CurrentFnName << ":\n";
 
@@ -856,16 +856,16 @@
 
   // Print out jump tables referenced by the function.
   EmitJumpTableInfo(MF.getJumpTableInfo(), MF);
-  
+
   // Emit post-function debug information.
   DW.EndFunction();
-  
+
   // We didn't modify anything.
   return false;
 }
 
 
-bool DarwinAsmPrinter::doInitialization(Module &M) {
+bool PPCDarwinAsmPrinter::doInitialization(Module &M) {
   static const char *const CPUDirectives[] = {
     "",
     "ppc",
@@ -887,9 +887,9 @@
     Directive = PPC::DIR_64;
   assert(Directive <= PPC::DIR_64 && "Directive out of range.");
   O << "\t.machine " << CPUDirectives[Directive] << "\n";
-     
+
   bool Result = AsmPrinter::doInitialization(M);
-  
+
   // Emit initial debug information.
   DW.BeginModule(&M);
 
@@ -901,7 +901,7 @@
 
   // Darwin wants symbols to be quoted if they have complex names.
   Mang->setUseQuotes(true);
-  
+
   // Prime text sections so they are adjacent.  This reduces the likelihood a
   // large data or debug section causes a branch to exceed 16M limit.
   SwitchToTextSection("\t.section __TEXT,__textcoal_nt,coalesced,"
@@ -914,18 +914,18 @@
                         "pure_instructions,16");
   }
   SwitchToTextSection(TAI->getTextSection());
-  
+
   return Result;
 }
 
-bool DarwinAsmPrinter::doFinalization(Module &M) {
+bool PPCDarwinAsmPrinter::doFinalization(Module &M) {
   const TargetData *TD = TM.getTargetData();
 
   // Print out module-level global variables here.
   for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
        I != E; ++I) {
     if (!I->hasInitializer()) continue;   // External global require no code
-    
+
     // Check to see if this is a special global used by LLVM, if so, emit it.
     if (EmitSpecialLLVMGlobal(I)) {
       if (TM.getRelocationModel() == Reloc::Static) {
@@ -936,13 +936,13 @@
       }
       continue;
     }
-    
+
     std::string name = Mang->getValueName(I);
-    
+
     if (I->hasHiddenVisibility())
       if (const char *Directive = TAI->getHiddenDirective())
         O << Directive << name << "\n";
-    
+
     Constant *C = I->getInitializer();
     const Type *Type = C->getType();
     unsigned Size = TD->getABITypeSize(Type);
@@ -1156,7 +1156,6 @@
         O << "\t.quad\t0\n";
       else
         O << "\t.long\t0\n";
-        
     }
   }
 
@@ -1184,9 +1183,8 @@
   const PPCSubtarget *Subtarget = &tm.getSubtarget();
 
   if (Subtarget->isDarwin()) {
-    return new DarwinAsmPrinter(o, tm, tm.getTargetAsmInfo());
+    return new PPCDarwinAsmPrinter(o, tm, tm.getTargetAsmInfo());
   } else {
-    return new LinuxAsmPrinter(o, tm, tm.getTargetAsmInfo());
+    return new PPCLinuxAsmPrinter(o, tm, tm.getTargetAsmInfo());
   }
 }
-




From asl at math.spbu.ru  Fri Aug  8 13:23:25 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 18:23:25 -0000
Subject: [llvm-commits] [llvm] r54537 - in /llvm/trunk/lib/Target/PowerPC:
 PPCAsmPrinter.cpp PPCTargetAsmInfo.cpp PPCTargetAsmInfo.h
Message-ID: <200808081823.m78INPCH009515@zion.cs.uiuc.edu>

Author: asl
Date: Fri Aug  8 13:23:25 2008
New Revision: 54537

URL: http://llvm.org/viewvc/llvm-project?rev=54537&view=rev
Log:
Switch PPC/Darwin to new section handling stuff

Modified:
    llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h

Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54537&r1=54536&r2=54537&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug  8 13:23:25 2008
@@ -348,6 +348,7 @@
     /// getSectionForFunction - Return the section that we should emit the
     /// specified function body into.
     virtual std::string getSectionForFunction(const Function &F) const;
+    void printModuleLevelGV(const GlobalVariable* GVar);
   };
 } // end of anonymous namespace
 
@@ -771,25 +772,11 @@
 }
 
 std::string PPCLinuxAsmPrinter::getSectionForFunction(const Function &F) const {
-  switch (F.getLinkage()) {
-  default: assert(0 && "Unknown linkage type!");
-  case Function::ExternalLinkage:
-  case Function::InternalLinkage: return TAI->getTextSection();
-  case Function::WeakLinkage:
-  case Function::LinkOnceLinkage:
-    return ".text";
-  }
+  return TAI->SectionForGlobal(&F);
 }
 
 std::string PPCDarwinAsmPrinter::getSectionForFunction(const Function &F) const {
-  switch (F.getLinkage()) {
-  default: assert(0 && "Unknown linkage type!");
-  case Function::ExternalLinkage:
-  case Function::InternalLinkage: return TAI->getTextSection();
-  case Function::WeakLinkage:
-  case Function::LinkOnceLinkage:
-    return "\t.section __TEXT,__textcoal_nt,coalesced,pure_instructions";
-  }
+  return TAI->SectionForGlobal(&F);
 }
 
 /// runOnMachineFunction - This uses the printMachineInstruction()
@@ -918,147 +905,113 @@
   return Result;
 }
 
-bool PPCDarwinAsmPrinter::doFinalization(Module &M) {
+void PPCDarwinAsmPrinter::printModuleLevelGV(const GlobalVariable* GVar) {
   const TargetData *TD = TM.getTargetData();
 
-  // Print out module-level global variables here.
-  for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
-       I != E; ++I) {
-    if (!I->hasInitializer()) continue;   // External global require no code
+  if (!GVar->hasInitializer())
+    return;   // External global require no code
 
-    // Check to see if this is a special global used by LLVM, if so, emit it.
-    if (EmitSpecialLLVMGlobal(I)) {
-      if (TM.getRelocationModel() == Reloc::Static) {
-        if (I->getName() == "llvm.global_ctors")
-          O << ".reference .constructors_used\n";
-        else if (I->getName() == "llvm.global_dtors")
-          O << ".reference .destructors_used\n";
-      }
-      continue;
+  // Check to see if this is a special global used by LLVM, if so, emit it.
+  if (EmitSpecialLLVMGlobal(GVar)) {
+    if (TM.getRelocationModel() == Reloc::Static) {
+      if (GVar->getName() == "llvm.global_ctors")
+        O << ".reference .constructors_used\n";
+      else if (GVar->getName() == "llvm.global_dtors")
+        O << ".reference .destructors_used\n";
     }
+    return;
+  }
 
-    std::string name = Mang->getValueName(I);
-
-    if (I->hasHiddenVisibility())
-      if (const char *Directive = TAI->getHiddenDirective())
-        O << Directive << name << "\n";
+  std::string name = Mang->getValueName(GVar);
+  std::string SectionName = TAI->SectionForGlobal(GVar);
 
-    Constant *C = I->getInitializer();
-    const Type *Type = C->getType();
-    unsigned Size = TD->getABITypeSize(Type);
-    unsigned Align = TD->getPreferredAlignmentLog(I);
+  if (GVar->hasHiddenVisibility())
+    if (const char *Directive = TAI->getHiddenDirective())
+      O << Directive << name << "\n";
 
-    if (C->isNullValue() && /* FIXME: Verify correct */
-        !I->hasSection() && (I->hasCommonLinkage() ||
-         I->hasInternalLinkage() || I->hasWeakLinkage() ||
-         I->hasLinkOnceLinkage() || I->hasExternalLinkage())) {
-      if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
-      if (I->hasExternalLinkage()) {
-        O << "\t.globl " << name << '\n';
-        O << "\t.zerofill __DATA, __common, " << name << ", "
-          << Size << ", " << Align;
-      } else if (I->hasInternalLinkage()) {
-        SwitchToDataSection("\t.data", I);
-        O << TAI->getLCOMMDirective() << name << "," << Size << "," << Align;
-      } else if (!I->hasCommonLinkage()) {
-        O << "\t.globl " << name << "\n"
-          << TAI->getWeakDefDirective() << name << "\n";
-        SwitchToDataSection("\t.section __DATA,__datacoal_nt,coalesced", I);
-        EmitAlignment(Align, I);
-        O << name << ":\t\t\t\t" << TAI->getCommentString() << " ";
-        PrintUnmangledNameSafely(I, O);
-        O << "\n";
-        EmitGlobalConstant(C);
-        continue;
-      } else {
-        SwitchToDataSection("\t.data", I);
-        O << ".comm " << name << "," << Size;
-        // Darwin 9 and above support aligned common data.
-        if (Subtarget.isDarwin9())
-          O << "," << Align;
-      }
-      O << "\t\t" << TAI->getCommentString() << " '";
-      PrintUnmangledNameSafely(I, O);
-      O << "'\n";
+  Constant *C = GVar->getInitializer();
+  const Type *Type = C->getType();
+  unsigned Size = TD->getABITypeSize(Type);
+  unsigned Align = TD->getPreferredAlignmentLog(GVar);
+
+  SwitchToDataSection(SectionName.c_str());
+
+  if (C->isNullValue() && /* FIXME: Verify correct */
+      !GVar->hasSection() &&
+      (GVar->hasInternalLinkage() || GVar->hasExternalLinkage() ||
+       GVar->isWeakForLinker())) {
+    if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
+
+    if (GVar->hasExternalLinkage()) {
+      O << "\t.globl " << name << '\n';
+      O << "\t.zerofill __DATA, __common, " << name << ", "
+        << Size << ", " << Align;
+    } else if (GVar->hasInternalLinkage()) {
+      O << TAI->getLCOMMDirective() << name << "," << Size << "," << Align;
+    } else if (!GVar->hasCommonLinkage()) {
+      O << "\t.globl " << name << "\n"
+        << TAI->getWeakDefDirective() << name << "\n";
+      EmitAlignment(Align, GVar);
+      O << name << ":\t\t\t\t" << TAI->getCommentString() << " ";
+      PrintUnmangledNameSafely(GVar, O);
+      O << "\n";
+      EmitGlobalConstant(C);
+      return;
     } else {
-      switch (I->getLinkage()) {
-      case GlobalValue::LinkOnceLinkage:
-      case GlobalValue::WeakLinkage:
-      case GlobalValue::CommonLinkage:
-        O << "\t.globl " << name << '\n'
-          << "\t.weak_definition " << name << '\n';
-        if (!I->isConstant())
-          SwitchToDataSection("\t.section __DATA,__datacoal_nt,coalesced", I);
-        else {
-          const ArrayType *AT = dyn_cast(Type);
-          if (AT && AT->getElementType()==Type::Int8Ty)
-            SwitchToDataSection("\t.section __TEXT,__const_coal,coalesced", I);
-          else
-            SwitchToDataSection("\t.section __DATA,__const_coal,coalesced", I);
-        }
-        break;
-      case GlobalValue::AppendingLinkage:
-        // FIXME: appending linkage variables should go into a section of
-        // their name or something.  For now, just emit them as external.
-      case GlobalValue::ExternalLinkage:
-        // If external or appending, declare as a global symbol
-        O << "\t.globl " << name << "\n";
-        // FALL THROUGH
-      case GlobalValue::InternalLinkage:
-        if (I->isConstant()) {
-          const ConstantArray *CVA = dyn_cast(C);
-          if (TAI->getCStringSection() && CVA && CVA->isCString()) {
-            SwitchToDataSection(TAI->getCStringSection(), I);
-            break;
-          }
-        }
-        if (I->hasSection()) {
-          // Honor all section names on Darwin; ObjC uses this
-          std::string SectionName = ".section " + I->getSection();
-          SwitchToDataSection(SectionName.c_str());
-        } else if (!I->isConstant())
-          SwitchToDataSection(TAI->getDataSection(), I);
-        else {
-          // Read-only data.
-          bool HasReloc = C->ContainsRelocations();
-          if (HasReloc &&
-              TM.getRelocationModel() != Reloc::Static)
-            SwitchToDataSection("\t.const_data\n");
-          else if (!HasReloc && Size == 4 &&
-                   TAI->getFourByteConstantSection())
-            SwitchToDataSection(TAI->getFourByteConstantSection(), I);
-          else if (!HasReloc && Size == 8 &&
-                   TAI->getEightByteConstantSection())
-            SwitchToDataSection(TAI->getEightByteConstantSection(), I);
-          else if (!HasReloc && Size == 16 &&
-                   TAI->getSixteenByteConstantSection())
-            SwitchToDataSection(TAI->getSixteenByteConstantSection(), I);
-          else if (TAI->getReadOnlySection())
-            SwitchToDataSection(TAI->getReadOnlySection(), I);
-          else
-            SwitchToDataSection(TAI->getDataSection(), I);
-        }
-        break;
-      default:
-        cerr << "Unknown linkage type!";
-        abort();
-      }
+      O << ".comm " << name << "," << Size;
+      // Darwin 9 and above support aligned common data.
+      if (Subtarget.isDarwin9())
+        O << "," << Align;
+    }
+    O << "\t\t" << TAI->getCommentString() << " '";
+    PrintUnmangledNameSafely(GVar, O);
+    O << "'\n";
+    return;
+  }
 
-      EmitAlignment(Align, I);
-      O << name << ":\t\t\t\t" << TAI->getCommentString() << " '";
-      PrintUnmangledNameSafely(I, O);
-      O << "'\n";
+  switch (GVar->getLinkage()) {
+   case GlobalValue::LinkOnceLinkage:
+   case GlobalValue::WeakLinkage:
+   case GlobalValue::CommonLinkage:
+    O << "\t.globl " << name << '\n'
+      << "\t.weak_definition " << name << '\n';
+    break;
+   case GlobalValue::AppendingLinkage:
+    // FIXME: appending linkage variables should go into a section of
+    // their name or something.  For now, just emit them as external.
+   case GlobalValue::ExternalLinkage:
+    // If external or appending, declare as a global symbol
+    O << "\t.globl " << name << "\n";
+    // FALL THROUGH
+   case GlobalValue::InternalLinkage:
+    break;
+   default:
+    cerr << "Unknown linkage type!";
+    abort();
+  }
 
-      // If the initializer is a extern weak symbol, remember to emit the weak
-      // reference!
-      if (const GlobalValue *GV = dyn_cast(C))
-        if (GV->hasExternalWeakLinkage())
-          ExtWeakSymbols.insert(GV);
+  EmitAlignment(Align, GVar);
+  O << name << ":\t\t\t\t" << TAI->getCommentString() << " '";
+  PrintUnmangledNameSafely(GVar, O);
+  O << "'\n";
+
+  // If the initializer is a extern weak symbol, remember to emit the weak
+  // reference!
+  if (const GlobalValue *GV = dyn_cast(C))
+    if (GV->hasExternalWeakLinkage())
+      ExtWeakSymbols.insert(GV);
 
-      EmitGlobalConstant(C);
-      O << '\n';
-    }
-  }
+  EmitGlobalConstant(C);
+  O << '\n';
+}
+
+bool PPCDarwinAsmPrinter::doFinalization(Module &M) {
+  const TargetData *TD = TM.getTargetData();
+
+  // Print out module-level global variables here.
+  for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
+       I != E; ++I)
+    printModuleLevelGV(I);
 
   bool isPPC64 = TD->getPointerSizeInBits() == 64;
 

Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp?rev=54537&r1=54536&r2=54537&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Fri Aug  8 13:23:25 2008
@@ -21,7 +21,7 @@
 
 PPCTargetAsmInfo::PPCTargetAsmInfo(const PPCTargetMachine &TM) {
   bool isPPC64 = TM.getSubtargetImpl()->isPPC64();
-  
+
   ZeroDirective = "\t.space\t";
   SetDirective = "\t.set";
   Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0;  
@@ -32,9 +32,8 @@
   AssemblerDialect = TM.getSubtargetImpl()->getAsmFlavor();
 }
 
-PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM)
-: PPCTargetAsmInfo(TM)
-{
+PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM):
+  PPCTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
   PCSymbol = ".";
   CommentString = ";";
   GlobalPrefix = "_";

Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h?rev=54537&r1=54536&r2=54537&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Fri Aug  8 13:23:25 2008
@@ -15,17 +15,19 @@
 #define PPCTARGETASMINFO_H
 
 #include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Target/DarwinTargetAsmInfo.h"
 
 namespace llvm {
 
   // Forward declaration.
   class PPCTargetMachine;
-  
-  struct PPCTargetAsmInfo : public TargetAsmInfo {
+
+  struct PPCTargetAsmInfo : public virtual TargetAsmInfo {
     explicit PPCTargetAsmInfo(const PPCTargetMachine &TM);
   };
 
-  struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo {
+  struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo,
+                                  public DarwinTargetAsmInfo{
     explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;




From asl at math.spbu.ru  Fri Aug  8 13:23:49 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 18:23:49 -0000
Subject: [llvm-commits] [llvm] r54538 - in /llvm/trunk/lib/Target/PowerPC:
 PPCAsmPrinter.cpp PPCTargetAsmInfo.cpp PPCTargetAsmInfo.h
Message-ID: <200808081823.m78INniW009546@zion.cs.uiuc.edu>

Author: asl
Date: Fri Aug  8 13:23:49 2008
New Revision: 54538

URL: http://llvm.org/viewvc/llvm-project?rev=54538&view=rev
Log:
Convert PPC/Linux to new section printing stuff

Modified:
    llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
    llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h

Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54538&r1=54537&r2=54538&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug  8 13:23:49 2008
@@ -317,6 +317,7 @@
     /// getSectionForFunction - Return the section that we should emit the
     /// specified function body into.
     virtual std::string getSectionForFunction(const Function &F) const;
+    void printModuleLevelGV(const GlobalVariable* GVar);
   };
 
   /// PPCDarwinAsmPrinter - PowerPC assembly printer, customized for Darwin/Mac
@@ -657,111 +658,95 @@
       OS << *Name;
 }
 
-bool PPCLinuxAsmPrinter::doFinalization(Module &M) {
+void PPCLinuxAsmPrinter::printModuleLevelGV(const GlobalVariable* GVar) {
   const TargetData *TD = TM.getTargetData();
 
-  // Print out module-level global variables here.
-  for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
-       I != E; ++I) {
-    if (!I->hasInitializer()) continue;   // External global require no code
+  if (!GVar->hasInitializer())
+    return;   // External global require no code
+
+  // Check to see if this is a special global used by LLVM, if so, emit it.
+  if (EmitSpecialLLVMGlobal(GVar))
+    return;
 
-    // Check to see if this is a special global used by LLVM, if so, emit it.
-    if (EmitSpecialLLVMGlobal(I))
-      continue;
-
-    std::string name = Mang->getValueName(I);
-
-    if (I->hasHiddenVisibility())
-      if (const char *Directive = TAI->getHiddenDirective())
-        O << Directive << name << "\n";
-
-    Constant *C = I->getInitializer();
-    unsigned Size = TD->getABITypeSize(C->getType());
-    unsigned Align = TD->getPreferredAlignmentLog(I);
-
-    if (C->isNullValue() && /* FIXME: Verify correct */
-        !I->hasSection() && (I->hasCommonLinkage() ||
-         I->hasInternalLinkage() || I->hasWeakLinkage() ||
-         I->hasLinkOnceLinkage() || I->hasExternalLinkage())) {
+  std::string name = Mang->getValueName(GVar);
+  std::string SectionName = TAI->SectionForGlobal(GVar);
+
+  if (GVar->hasHiddenVisibility())
+    if (const char *Directive = TAI->getHiddenDirective())
+      O << Directive << name << "\n";
+
+  Constant *C = GVar->getInitializer();
+  const Type *Type = C->getType();
+  unsigned Size = TD->getABITypeSize(Type);
+  unsigned Align = TD->getPreferredAlignmentLog(GVar);
+
+  SwitchToDataSection(SectionName.c_str());
+
+  if (C->isNullValue() && /* FIXME: Verify correct */
+      !GVar->hasSection() &&
+      (GVar->hasInternalLinkage() || GVar->hasExternalLinkage() ||
+       GVar->isWeakForLinker())) {
       if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
-      if (I->hasExternalLinkage()) {
+
+      if (GVar->hasExternalLinkage()) {
         O << "\t.global " << name << '\n';
         O << "\t.type " << name << ", @object\n";
-        if (TAI->getBSSSection())
-          SwitchToDataSection(TAI->getBSSSection(), I);
         O << name << ":\n";
         O << "\t.zero " << Size << "\n";
-      } else if (I->hasInternalLinkage()) {
-        SwitchToDataSection("\t.data", I);
+      } else if (GVar->hasInternalLinkage()) {
         O << TAI->getLCOMMDirective() << name << "," << Size;
       } else {
-        SwitchToDataSection("\t.data", I);
         O << ".comm " << name << "," << Size;
       }
       O << "\t\t" << TAI->getCommentString() << " '";
-      PrintUnmangledNameSafely(I, O);
+      PrintUnmangledNameSafely(GVar, O);
       O << "'\n";
-    } else {
-      switch (I->getLinkage()) {
-      case GlobalValue::LinkOnceLinkage:
-      case GlobalValue::WeakLinkage:
-      case GlobalValue::CommonLinkage:
-        O << "\t.global " << name << '\n'
-          << "\t.type " << name << ", @object\n"
-          << "\t.weak " << name << '\n';
-        SwitchToDataSection("\t.data", I);
-        break;
-      case GlobalValue::AppendingLinkage:
-        // FIXME: appending linkage variables should go into a section of
-        // their name or something.  For now, just emit them as external.
-      case GlobalValue::ExternalLinkage:
-        // If external or appending, declare as a global symbol
-        O << "\t.global " << name << "\n"
-          << "\t.type " << name << ", @object\n";
-        // FALL THROUGH
-      case GlobalValue::InternalLinkage:
-        if (I->isConstant()) {
-          const ConstantArray *CVA = dyn_cast(C);
-          if (TAI->getCStringSection() && CVA && CVA->isCString()) {
-            SwitchToDataSection(TAI->getCStringSection(), I);
-            break;
-          }
-        }
-
-        // FIXME: special handling for ".ctors" & ".dtors" sections
-        if (I->hasSection() &&
-            (I->getSection() == ".ctors" ||
-             I->getSection() == ".dtors")) {
-          std::string SectionName = ".section " + I->getSection()
-                                                + ",\"aw\", at progbits";
-          SwitchToDataSection(SectionName.c_str());
-        } else {
-          if (I->isConstant() && TAI->getReadOnlySection())
-            SwitchToDataSection(TAI->getReadOnlySection(), I);
-          else
-            SwitchToDataSection(TAI->getDataSection(), I);
-        }
-        break;
-      default:
-        cerr << "Unknown linkage type!";
-        abort();
-      }
+      return;
+  }
 
-      EmitAlignment(Align, I);
-      O << name << ":\t\t\t\t" << TAI->getCommentString() << " '";
-      PrintUnmangledNameSafely(I, O);
-      O << "'\n";
+  switch (GVar->getLinkage()) {
+   case GlobalValue::LinkOnceLinkage:
+   case GlobalValue::WeakLinkage:
+   case GlobalValue::CommonLinkage:
+    O << "\t.global " << name << '\n'
+      << "\t.type " << name << ", @object\n"
+      << "\t.weak " << name << '\n';
+    break;
+   case GlobalValue::AppendingLinkage:
+    // FIXME: appending linkage variables should go into a section of
+    // their name or something.  For now, just emit them as external.
+   case GlobalValue::ExternalLinkage:
+    // If external or appending, declare as a global symbol
+    O << "\t.global " << name << "\n"
+      << "\t.type " << name << ", @object\n";
+    // FALL THROUGH
+   case GlobalValue::InternalLinkage:
+    break;
+   default:
+    cerr << "Unknown linkage type!";
+    abort();
+  }
 
-      // If the initializer is a extern weak symbol, remember to emit the weak
-      // reference!
-      if (const GlobalValue *GV = dyn_cast(C))
-        if (GV->hasExternalWeakLinkage())
-          ExtWeakSymbols.insert(GV);
+  EmitAlignment(Align, GVar);
+  O << name << ":\t\t\t\t" << TAI->getCommentString() << " '";
+  PrintUnmangledNameSafely(GVar, O);
+  O << "'\n";
 
-      EmitGlobalConstant(C);
-      O << '\n';
-    }
-  }
+  // If the initializer is a extern weak symbol, remember to emit the weak
+  // reference!
+  if (const GlobalValue *GV = dyn_cast(C))
+    if (GV->hasExternalWeakLinkage())
+      ExtWeakSymbols.insert(GV);
+
+  EmitGlobalConstant(C);
+  O << '\n';
+}
+
+bool PPCLinuxAsmPrinter::doFinalization(Module &M) {
+  // Print out module-level global variables here.
+  for (Module::const_global_iterator I = M.global_begin(), E = M.global_end();
+       I != E; ++I)
+    printModuleLevelGV(I);
 
   // TODO
 
@@ -783,7 +768,6 @@
 /// method to print assembly for each instruction.
 ///
 bool PPCDarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) {
-
   SetupMachineFunction(MF);
   O << "\n\n";
 

Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp?rev=54538&r1=54537&r2=54538&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Fri Aug  8 13:23:49 2008
@@ -104,9 +104,8 @@
 }
 
 
-PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM)
-: PPCTargetAsmInfo(TM)
-{
+PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM) :
+  PPCTargetAsmInfo(TM), ELFTargetAsmInfo(TM) {
   CommentString = "#";
   GlobalPrefix = "";
   PrivateGlobalPrefix = "";

Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h?rev=54538&r1=54537&r2=54538&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Fri Aug  8 13:23:49 2008
@@ -16,6 +16,7 @@
 
 #include "llvm/Target/TargetAsmInfo.h"
 #include "llvm/Target/DarwinTargetAsmInfo.h"
+#include "llvm/Target/ELFTargetAsmInfo.h"
 
 namespace llvm {
 
@@ -27,13 +28,14 @@
   };
 
   struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo,
-                                  public DarwinTargetAsmInfo{
+                                  public DarwinTargetAsmInfo {
     explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;
   };
 
-  struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo {
+  struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo,
+                                 public ELFTargetAsmInfo {
     explicit PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM);
     virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason,
                                            bool Global) const;




From asl at math.spbu.ru  Fri Aug  8 13:24:10 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 18:24:10 -0000
Subject: [llvm-commits] [llvm] r54539 -
	/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
Message-ID: <200808081824.m78IOAB4009566@zion.cs.uiuc.edu>

Author: asl
Date: Fri Aug  8 13:24:10 2008
New Revision: 54539

URL: http://llvm.org/viewvc/llvm-project?rev=54539&view=rev
Log:
Use chars, where possible

Modified:
    llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp

Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54539&r1=54538&r2=54539&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug  8 13:24:10 2008
@@ -529,7 +529,7 @@
       printOperand(MI, 0);
       O << ", ";
       printOperand(MI, 1);
-      O << ", " << (unsigned int)SH << "\n";
+      O << ", " << (unsigned int)SH << '\n';
       return;
     }
   } else if (MI->getOpcode() == PPC::OR || MI->getOpcode() == PPC::OR8) {
@@ -538,7 +538,7 @@
       printOperand(MI, 0);
       O << ", ";
       printOperand(MI, 1);
-      O << "\n";
+      O << '\n';
       return;
     }
   } else if (MI->getOpcode() == PPC::RLDICR) {
@@ -550,7 +550,7 @@
       printOperand(MI, 0);
       O << ", ";
       printOperand(MI, 1);
-      O << ", " << (unsigned int)SH << "\n";
+      O << ", " << (unsigned int)SH << '\n';
       return;
     }
   }
@@ -595,7 +595,7 @@
 
   if (F->hasHiddenVisibility())
     if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << CurrentFnName << "\n";
+      O << Directive << CurrentFnName << '\n';
 
   EmitAlignment(2, F);
   O << CurrentFnName << ":\n";
@@ -618,7 +618,7 @@
     }
   }
 
-  O << "\t.size\t" << CurrentFnName << ",.-" << CurrentFnName << "\n";
+  O << "\t.size\t" << CurrentFnName << ",.-" << CurrentFnName << '\n';
 
   // Print out jump tables referenced by the function.
   EmitJumpTableInfo(MF.getJumpTableInfo(), MF);
@@ -673,7 +673,7 @@
 
   if (GVar->hasHiddenVisibility())
     if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << name << "\n";
+      O << Directive << name << '\n';
 
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();
@@ -692,11 +692,11 @@
         O << "\t.global " << name << '\n';
         O << "\t.type " << name << ", @object\n";
         O << name << ":\n";
-        O << "\t.zero " << Size << "\n";
+        O << "\t.zero " << Size << '\n';
       } else if (GVar->hasInternalLinkage()) {
-        O << TAI->getLCOMMDirective() << name << "," << Size;
+        O << TAI->getLCOMMDirective() << name << ',' << Size;
       } else {
-        O << ".comm " << name << "," << Size;
+        O << ".comm " << name << ',' << Size;
       }
       O << "\t\t" << TAI->getCommentString() << " '";
       PrintUnmangledNameSafely(GVar, O);
@@ -717,7 +717,7 @@
     // their name or something.  For now, just emit them as external.
    case GlobalValue::ExternalLinkage:
     // If external or appending, declare as a global symbol
-    O << "\t.global " << name << "\n"
+    O << "\t.global " << name << '\n'
       << "\t.type " << name << ", @object\n";
     // FALL THROUGH
    case GlobalValue::InternalLinkage:
@@ -783,18 +783,18 @@
   case Function::InternalLinkage:  // Symbols default to internal.
     break;
   case Function::ExternalLinkage:
-    O << "\t.globl\t" << CurrentFnName << "\n";
+    O << "\t.globl\t" << CurrentFnName << '\n';
     break;
   case Function::WeakLinkage:
   case Function::LinkOnceLinkage:
-    O << "\t.globl\t" << CurrentFnName << "\n";
-    O << "\t.weak_definition\t" << CurrentFnName << "\n";
+    O << "\t.globl\t" << CurrentFnName << '\n';
+    O << "\t.weak_definition\t" << CurrentFnName << '\n';
     break;
   }
 
   if (F->hasHiddenVisibility())
     if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << CurrentFnName << "\n";
+      O << Directive << CurrentFnName << '\n';
 
   EmitAlignment(OptimizeForSize ? 2 : 4, F);
   O << CurrentFnName << ":\n";
@@ -857,7 +857,7 @@
   if (Subtarget.isPPC64() && Directive < PPC::DIR_970)
     Directive = PPC::DIR_64;
   assert(Directive <= PPC::DIR_64 && "Directive out of range.");
-  O << "\t.machine " << CPUDirectives[Directive] << "\n";
+  O << "\t.machine " << CPUDirectives[Directive] << '\n';
 
   bool Result = AsmPrinter::doInitialization(M);
 
@@ -911,7 +911,7 @@
 
   if (GVar->hasHiddenVisibility())
     if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << name << "\n";
+      O << Directive << name << '\n';
 
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();
@@ -931,21 +931,21 @@
       O << "\t.zerofill __DATA, __common, " << name << ", "
         << Size << ", " << Align;
     } else if (GVar->hasInternalLinkage()) {
-      O << TAI->getLCOMMDirective() << name << "," << Size << "," << Align;
+      O << TAI->getLCOMMDirective() << name << ',' << Size << ',' << Align;
     } else if (!GVar->hasCommonLinkage()) {
-      O << "\t.globl " << name << "\n"
-        << TAI->getWeakDefDirective() << name << "\n";
+      O << "\t.globl " << name << '\n'
+        << TAI->getWeakDefDirective() << name << '\n';
       EmitAlignment(Align, GVar);
       O << name << ":\t\t\t\t" << TAI->getCommentString() << " ";
       PrintUnmangledNameSafely(GVar, O);
-      O << "\n";
+      O << '\n';
       EmitGlobalConstant(C);
       return;
     } else {
-      O << ".comm " << name << "," << Size;
+      O << ".comm " << name << ',' << Size;
       // Darwin 9 and above support aligned common data.
       if (Subtarget.isDarwin9())
-        O << "," << Align;
+        O << ',' << Align;
     }
     O << "\t\t" << TAI->getCommentString() << " '";
     PrintUnmangledNameSafely(GVar, O);
@@ -965,7 +965,7 @@
     // their name or something.  For now, just emit them as external.
    case GlobalValue::ExternalLinkage:
     // If external or appending, declare as a global symbol
-    O << "\t.globl " << name << "\n";
+    O << "\t.globl " << name << '\n';
     // FALL THROUGH
    case GlobalValue::InternalLinkage:
     break;
@@ -1010,9 +1010,9 @@
       std::string L0p = (p[0]=='\"') ? "\"L0$" + p.substr(1) : "L0$" + p ;
       printSuffixedName(p, "$stub");
       O << ":\n";
-      O << "\t.indirect_symbol " << *i << "\n";
+      O << "\t.indirect_symbol " << *i << '\n';
       O << "\tmflr r0\n";
-      O << "\tbcl 20,31," << L0p << "\n";
+      O << "\tbcl 20,31," << L0p << '\n';
       O << L0p << ":\n";
       O << "\tmflr r11\n";
       O << "\taddis r11,r11,ha16(";
@@ -1030,7 +1030,7 @@
       SwitchToDataSection(".lazy_symbol_pointer");
       printSuffixedName(p, "$lazy_ptr");
       O << ":\n";
-      O << "\t.indirect_symbol " << *i << "\n";
+      O << "\t.indirect_symbol " << *i << '\n';
       if (isPPC64)
         O << "\t.quad dyld_stub_binding_helper\n";
       else
@@ -1045,7 +1045,7 @@
       std::string p = *i;
       printSuffixedName(p, "$stub");
       O << ":\n";
-      O << "\t.indirect_symbol " << *i << "\n";
+      O << "\t.indirect_symbol " << *i << '\n';
       O << "\tlis r11,ha16(";
       printSuffixedName(p, "$lazy_ptr");
       O << ")\n";
@@ -1060,7 +1060,7 @@
       SwitchToDataSection(".lazy_symbol_pointer");
       printSuffixedName(p, "$lazy_ptr");
       O << ":\n";
-      O << "\t.indirect_symbol " << *i << "\n";
+      O << "\t.indirect_symbol " << *i << '\n';
       if (isPPC64)
         O << "\t.quad dyld_stub_binding_helper\n";
       else
@@ -1068,7 +1068,7 @@
     }
   }
 
-  O << "\n";
+  O << '\n';
 
   if (TAI->doesSupportExceptionHandling() && MMI) {
     // Add the (possibly multiple) personalities to the set of global values.
@@ -1088,7 +1088,7 @@
       std::string p = *I;
       printSuffixedName(p, "$non_lazy_ptr");
       O << ":\n";
-      O << "\t.indirect_symbol " << *I << "\n";
+      O << "\t.indirect_symbol " << *I << '\n';
       if (isPPC64)
         O << "\t.quad\t0\n";
       else




From asl at math.spbu.ru  Fri Aug  8 13:25:07 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 18:25:07 -0000
Subject: [llvm-commits] [llvm] r54540 - in /llvm/trunk:
 include/llvm/CodeGen/AsmPrinter.h lib/CodeGen/AsmPrinter.cpp
 lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/Alpha/AlphaAsmPrinter.cpp
 lib/Target/IA64/IA64AsmPrinter.cpp lib/Target/Mips/MipsAsmPrinter.cpp
 lib/Target/PowerPC/PPCAsmPrinter.cpp lib/Target/Sparc/SparcAsmPrinter.cpp
 lib/Target/X86/X86ATTAsmPrinter.cpp
Message-ID: <200808081825.m78IP7WO009633@zion.cs.uiuc.edu>

Author: asl
Date: Fri Aug  8 13:25:07 2008
New Revision: 54540

URL: http://llvm.org/viewvc/llvm-project?rev=54540&view=rev
Log:
Handle visibility printing with all generality. Remove bunch of duplicate code.

Modified:
    llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
    llvm/trunk/lib/CodeGen/AsmPrinter.cpp
    llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
    llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp
    llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp
    llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
    llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
    llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp

Modified: llvm/trunk/include/llvm/CodeGen/AsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/AsmPrinter.h?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original)
+++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Fri Aug  8 13:25:07 2008
@@ -355,6 +355,10 @@
                            const char *Prefix = 0);
     void printSuffixedName(const std::string &Name, const char* Suffix);
 
+    /// printVisibility - This prints visibility information about symbol, if
+    /// this is suported by the target.
+    void printVisibility(const std::string& Name, unsigned Visibility) const;
+
   private:
     void EmitLLVMUsedList(Constant *List);
     void EmitXXStructorList(Constant *List);

Modified: llvm/trunk/lib/CodeGen/AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/AsmPrinter.cpp (original)
+++ llvm/trunk/lib/CodeGen/AsmPrinter.cpp Fri Aug  8 13:25:07 2008
@@ -1469,3 +1469,14 @@
 void AsmPrinter::printSuffixedName(const std::string &Name, const char* Suffix) {
   printSuffixedName(Name.c_str(), Suffix);
 }
+
+void AsmPrinter::printVisibility(const std::string& Name,
+                                 unsigned Visibility) const {
+  if (Visibility == GlobalValue::HiddenVisibility) {
+    if (const char *Directive = TAI->getHiddenDirective())
+      O << Directive << Name << '\n';
+  } else if (Visibility == GlobalValue::ProtectedVisibility) {
+    if (const char *Directive = TAI->getProtectedDirective())
+      O << Directive << Name << '\n';
+  }
+}

Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Fri Aug  8 13:25:07 2008
@@ -226,14 +226,7 @@
     break;
   }
 
-  const char *VisibilityDirective = NULL;
-  if (F->hasHiddenVisibility())
-    VisibilityDirective = TAI->getHiddenDirective();
-  else if (F->hasProtectedVisibility())
-    VisibilityDirective = TAI->getProtectedDirective();
-
-  if (VisibilityDirective)
-    O << VisibilityDirective << CurrentFnName << "\n";
+  printVisibility(CurrentFnName, F->getVisibility());
 
   if (AFI->isThumbFunction()) {
     EmitAlignment(1, F, AFI->getAlign());
@@ -870,14 +863,7 @@
   unsigned Size = TD->getABITypeSize(Type);
   unsigned Align = TD->getPreferredAlignmentLog(GVar);
 
-  const char *VisibilityDirective = NULL;
-  if (GVar->hasHiddenVisibility())
-    VisibilityDirective = TAI->getHiddenDirective();
-  else if (GVar->hasProtectedVisibility())
-    VisibilityDirective = TAI->getProtectedDirective();
-
-  if (VisibilityDirective)
-    O << VisibilityDirective << name << "\n";
+  printVisibility(name, GVar->getVisibility());
 
   if (Subtarget->isTargetELF())
     O << "\t.type " << name << ",%object\n";

Modified: llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp Fri Aug  8 13:25:07 2008
@@ -164,6 +164,8 @@
     break;
   }
 
+  printVisibility(CurrentFnName, F->getVisibility());
+
   O << "\t.ent " << CurrentFnName << "\n";
 
   O << CurrentFnName << ":\n";
@@ -221,8 +223,7 @@
   SwitchToDataSection(SectionName.c_str());
 
   // 1: Check visibility
-  if (GVar->hasHiddenVisibility())
-    O << TAI->getHiddenDirective() << name << "\n";
+  printVisibility(name, GVar->getVisibility());
 
   // 2: Kind
   switch (GVar->getLinkage()) {

Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Fri Aug  8 13:25:07 2008
@@ -142,6 +142,9 @@
   // Print out labels for the function.
   EmitAlignment(5);
   O << "\t.global\t" << CurrentFnName << '\n';
+
+  printVisibility(CurrentFnName, F->getVisibility());
+
   O << "\t.type\t" << CurrentFnName << ", @function\n";
   O << CurrentFnName << ":\n";
 
@@ -274,7 +277,7 @@
   unsigned Size = TD->getABITypeSize(C->getType());
   unsigned Align = TD->getPreferredAlignmentLog(GVar);
 
-  // FIXME: ELF supports visibility
+  printVisibility(name, GVar->getVisibility());
 
   SwitchToDataSection(SectionName.c_str());
 

Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp Fri Aug  8 13:25:07 2008
@@ -237,6 +237,8 @@
   O << "\t.globl\t"  << CurrentFnName << '\n';
   O << "\t.ent\t"    << CurrentFnName << '\n';
 
+  printVisibility(CurrentFnName, F->getVisibility());
+
   if ((TAI->hasDotTypeDotSizeDirective()) && Subtarget->isLinux())
     O << "\t.type\t"   << CurrentFnName << ", @function\n";
 
@@ -497,7 +499,7 @@
   } else
     Align = TD->getPreferredTypeAlignmentShift(CTy);
 
-  // FIXME: ELF supports visibility
+  printVisibility(name, GVar->getVisibility());
 
   SwitchToDataSection(SectionName.c_str());
 
@@ -508,7 +510,7 @@
 
       if (GVar->hasInternalLinkage())
         O << "\t.local\t" << name << '\n';
-      
+
       O << TAI->getCOMMDirective() << name << ',' << Size;
       if (TAI->getCOMMDirectiveTakesAlignment())
         O << ',' << (1 << Align);

Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug  8 13:25:07 2008
@@ -593,9 +593,7 @@
     break;
   }
 
-  if (F->hasHiddenVisibility())
-    if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << CurrentFnName << '\n';
+  printVisibility(CurrentFnName, F->getVisibility());
 
   EmitAlignment(2, F);
   O << CurrentFnName << ":\n";
@@ -671,9 +669,7 @@
   std::string name = Mang->getValueName(GVar);
   std::string SectionName = TAI->SectionForGlobal(GVar);
 
-  if (GVar->hasHiddenVisibility())
-    if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << name << '\n';
+  printVisibility(name, GVar->getVisibility());
 
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();
@@ -792,9 +788,7 @@
     break;
   }
 
-  if (F->hasHiddenVisibility())
-    if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << CurrentFnName << '\n';
+  printVisibility(CurrentFnName, F->getVisibility());
 
   EmitAlignment(OptimizeForSize ? 2 : 4, F);
   O << CurrentFnName << ":\n";
@@ -909,9 +903,7 @@
   std::string name = Mang->getValueName(GVar);
   std::string SectionName = TAI->SectionForGlobal(GVar);
 
-  if (GVar->hasHiddenVisibility())
-    if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << name << '\n';
+  printVisibility(name, GVar->getVisibility());
 
   Constant *C = GVar->getInitializer();
   const Type *Type = C->getType();

Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Fri Aug  8 13:25:07 2008
@@ -107,6 +107,9 @@
   SwitchToTextSection(getSectionForFunction(*F).c_str(), F);
   EmitAlignment(4, F);
   O << "\t.globl\t" << CurrentFnName << '\n';
+
+  printVisibility(CurrentFnName, F->getVisibility());
+
   O << "\t.type\t" << CurrentFnName << ", #function\n";
   O << CurrentFnName << ":\n";
 
@@ -250,7 +253,8 @@
   unsigned Size = TD->getABITypeSize(C->getType());
   unsigned Align = TD->getPreferredAlignment(GVar);
 
-  // FIXME: ELF supports visibility
+  printVisibility(name, GVar->getVisibility());
+
   SwitchToDataSection(SectionName.c_str());
 
   if (C->isNullValue() && !GVar->hasSection()) {

Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Fri Aug  8 13:25:07 2008
@@ -183,13 +183,8 @@
     }
     break;
   }
-  if (F->hasHiddenVisibility()) {
-    if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << CurrentFnName << '\n';
-  } else if (F->hasProtectedVisibility()) {
-    if (const char *Directive = TAI->getProtectedDirective())
-      O << Directive << CurrentFnName << '\n';
-  }
+
+  printVisibility(CurrentFnName, F->getVisibility());
 
   if (Subtarget->isTargetELF())
     O << "\t.type\t" << CurrentFnName << ", at function\n";
@@ -773,13 +768,7 @@
   unsigned Size = TD->getABITypeSize(Type);
   unsigned Align = TD->getPreferredAlignmentLog(GVar);
 
-  if (GVar->hasHiddenVisibility()) {
-    if (const char *Directive = TAI->getHiddenDirective())
-      O << Directive << name << '\n';
-  } else if (GVar->hasProtectedVisibility()) {
-    if (const char *Directive = TAI->getProtectedDirective())
-      O << Directive << name << '\n';
-  }
+  printVisibility(name, GVar->getVisibility());
 
   if (Subtarget->isTargetELF())
     O << "\t.type\t" << name << ", at object\n";




From asl at math.spbu.ru  Fri Aug  8 13:25:30 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 18:25:30 -0000
Subject: [llvm-commits] [llvm] r54541 -
	/llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp
Message-ID: <200808081825.m78IPUWl009657@zion.cs.uiuc.edu>

Author: asl
Date: Fri Aug  8 13:25:29 2008
New Revision: 54541

URL: http://llvm.org/viewvc/llvm-project?rev=54541&view=rev
Log:
Use mergeable strings sections on sparc

Modified:
    llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp

Modified: llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp?rev=54541&r1=54540&r2=54541&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Fri Aug  8 13:25:29 2008
@@ -24,6 +24,7 @@
   CommentString = "!";
   ConstantPoolSection = "\t.section \".rodata\",#alloc\n";
   COMMDirectiveTakesAlignment = true;
+  CStringSection=".rodata.str";
 }
 
 std::string SparcELFTargetAsmInfo::PrintSectionFlags(unsigned flags) const {




From asl at math.spbu.ru  Fri Aug  8 13:25:52 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 18:25:52 -0000
Subject: [llvm-commits] [llvm] r54542 - in /llvm/trunk/lib/Target/X86:
 X86ATTAsmPrinter.cpp X86TargetAsmInfo.cpp
Message-ID: <200808081825.m78IPrHx009684@zion.cs.uiuc.edu>

Author: asl
Date: Fri Aug  8 13:25:52 2008
New Revision: 54542

URL: http://llvm.org/viewvc/llvm-project?rev=54542&view=rev
Log:
Generalize

Modified:
    llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp
    llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp

Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp?rev=54542&r1=54541&r2=54542&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Fri Aug  8 13:25:52 2008
@@ -806,10 +806,8 @@
           return;
         } else {
           O << TAI->getCOMMDirective()  << name << ',' << Size;
-
-          // Leopard and above support aligned common symbols.
-          if (Subtarget->getDarwinVers() >= 9)
-            O << ',' << Align;
+          if (TAI->getCOMMDirectiveTakesAlignment())
+            O << ',' << (TAI->getAlignmentIsInBytes() ? (1 << Align) : Align);
         }
       } else {
         if (!Subtarget->isTargetCygMing()) {

Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=54542&r1=54541&r2=54542&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Fri Aug  8 13:25:52 2008
@@ -126,7 +126,8 @@
 
 X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const X86TargetMachine &TM):
   X86TargetAsmInfo(TM), DarwinTargetAsmInfo(TM) {
-  bool is64Bit = DTM->getSubtarget().is64Bit();
+  const X86Subtarget* Subtarget = &DTM->getSubtarget();
+  bool is64Bit = Subtarget->is64Bit();
 
   AlignmentIsInBytes = false;
   TextAlignFillValue = 0x90;
@@ -156,7 +157,8 @@
   LCOMMDirective = "\t.lcomm\t";
   SwitchToSectionDirective = "\t.section ";
   StringConstantPrefix = "\1LC";
-  COMMDirectiveTakesAlignment = false;
+  // Leopard and above support aligned common symbols.
+  COMMDirectiveTakesAlignment = (Subtarget->getDarwinVers() >= 9);
   HasDotTypeDotSizeDirective = false;
   if (TM.getRelocationModel() == Reloc::Static) {
     StaticCtorsSection = ".constructor";




From asl at math.spbu.ru  Fri Aug  8 13:26:11 2008
From: asl at math.spbu.ru (Anton Korobeynikov)
Date: Fri, 08 Aug 2008 18:26:11 -0000
Subject: [llvm-commits] [llvm] r54543 -
	/llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp
Message-ID: <200808081826.m78IQB6a009728@zion.cs.uiuc.edu>

Author: asl
Date: Fri Aug  8 13:26:10 2008
New Revision: 54543

URL: http://llvm.org/viewvc/llvm-project?rev=54543&view=rev
Log:
Properly print flags on Sparc

Modified:
    llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp

Modified: llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp?rev=54543&r1=54542&r2=54543&view=diff

==============================================================================
--- llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp (original)
+++ llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Fri Aug  8 13:26:10 2008
@@ -28,19 +28,18 @@
 }
 
 std::string SparcELFTargetAsmInfo::PrintSectionFlags(unsigned flags) const {
-  std::string Flags = ",";
-
   if (flags & SectionFlags::Mergeable)
     return ELFTargetAsmInfo::PrintSectionFlags(flags);
 
+  std::string Flags;
   if (!(flags & SectionFlags::Debug))
-    Flags += "#alloc";
+    Flags += ",#alloc";
   if (flags & SectionFlags::Code)
-    Flags += "#execinstr";
+    Flags += ",#execinstr";
   if (flags & SectionFlags::Writeable)
-    Flags += "#write";
+    Flags += ",#write";
   if (flags & SectionFlags::TLS)
-    Flags += "#tls";
+    Flags += ",#tls";
 
   return Flags;
 }




From gohman at apple.com  Fri Aug  8 13:30:21 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 08 Aug 2008 18:30:21 -0000
Subject: [llvm-commits] [llvm] r54544 - in /llvm/trunk:
 lib/Target/X86/X86InstrInfo.cpp lib/Target/X86/X86InstrSSE.td
 test/CodeGen/X86/extractps.ll
Message-ID: <200808081830.m78IULQB009898@zion.cs.uiuc.edu>

Author: djg
Date: Fri Aug  8 13:30:21 2008
New Revision: 54544

URL: http://llvm.org/viewvc/llvm-project?rev=54544&view=rev
Log:
Add an EXTRACTPSmr pattern to match the pattern that
X86ISelLowering creates.

Added:
    llvm/trunk/test/CodeGen/X86/extractps.ll
Modified:
    llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
    llvm/trunk/lib/Target/X86/X86InstrSSE.td

Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=54544&r1=54543&r2=54544&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Fri Aug  8 13:30:21 2008
@@ -238,6 +238,7 @@
     { X86::DIV32r,      X86::DIV32m, 1 },
     { X86::DIV64r,      X86::DIV64m, 1 },
     { X86::DIV8r,       X86::DIV8m, 1 },
+    { X86::EXTRACTPSrr, X86::EXTRACTPSmr, 0 },
     { X86::FsMOVAPDrr,  X86::MOVSDmr, 0 },
     { X86::FsMOVAPSrr,  X86::MOVSSmr, 0 },
     { X86::IDIV16r,     X86::IDIV16m, 1 },

Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSSE.td?rev=54544&r1=54543&r2=54544&view=diff

==============================================================================
--- llvm/trunk/lib/Target/X86/X86InstrSSE.td (original)
+++ llvm/trunk/lib/Target/X86/X86InstrSSE.td Fri Aug  8 13:30:21 2008
@@ -3485,6 +3485,13 @@
 
 defm EXTRACTPS   : SS41I_extractf32<0x17, "extractps">;
 
+// Also match an EXTRACTPS store when the store is done as f32 instead of i32.
+def : Pat<(store (f32 (bitconvert (extractelt (bc_v4i32 (v4f32 VR128:$src1)),
+                                              imm:$src2))),
+                 addr:$dst),
+          (EXTRACTPSmr addr:$dst, VR128:$src1, imm:$src2)>,
+         Requires<[HasSSE41]>;
+
 let Constraints = "$src1 = $dst" in {
   multiclass SS41I_insert8 opc, string OpcodeStr> {
     def rr : SS4AIi8:0 [#uses=2]
+
+define internal void @""() nounwind {
+        load float* @0, align 16                ; :1 [#uses=1]
+        insertelement <4 x float> undef, float %1, i32 0                ; <<4 x float>>:2 [#uses=1]
+        call <4 x float> @llvm.x86.sse.rsqrt.ss( <4 x float> %2 )              ; <<4 x float>>:3 [#uses=1]
+        extractelement <4 x float> %3, i32 0            ; :4 [#uses=1]
+        store float %4, float* @0, align 16
+        ret void
+}
+
+declare <4 x float> @llvm.x86.sse.rsqrt.ss(<4 x float>) nounwind readnone
+




From gohman at apple.com  Fri Aug  8 13:33:12 2008
From: gohman at apple.com (Dan Gohman)
Date: Fri, 08 Aug 2008 18:33:12 -0000
Subject: [llvm-commits] [llvm] r54545 -
	/llvm/trunk/lib/Analysis/ScalarEvolution.cpp
Message-ID: <200808081833.m78IXCpO010049@zion.cs.uiuc.edu>

Author: djg
Date: Fri Aug  8 13:33:12 2008
New Revision: 54545

URL: http://llvm.org/viewvc/llvm-project?rev=54545&view=rev
Log:
Canonicalize nested AddRecs in by nesting them in order of loop depth.

Modified:
    llvm/trunk/lib/Analysis/ScalarEvolution.cpp

Modified: llvm/trunk/lib/Analysis/ScalarEvolution.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolution.cpp?rev=54545&r1=54544&r2=54545&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/ScalarEvolution.cpp (original)
+++ llvm/trunk/lib/Analysis/ScalarEvolution.cpp Fri Aug  8 13:33:12 2008
@@ -1158,6 +1158,19 @@
     return getAddRecExpr(Operands, L);             // { X,+,0 }  -->  X
   }
 
+  // Canonicalize nested AddRecs in by nesting them in order of loop depth.
+  if (SCEVAddRecExpr *NestedAR = dyn_cast(Operands[0])) {
+    const Loop* NestedLoop = NestedAR->getLoop();
+    if (L->getLoopDepth() < NestedLoop->getLoopDepth()) {
+      std::vector NestedOperands(NestedAR->op_begin(),
+                                             NestedAR->op_end());
+      SCEVHandle NestedARHandle(NestedAR);
+      Operands[0] = NestedAR->getStart();
+      NestedOperands[0] = getAddRecExpr(Operands, L);
+      return getAddRecExpr(NestedOperands, NestedLoop);
+    }
+  }
+
   SCEVAddRecExpr *&Result =
     (*SCEVAddRecExprs)[std::make_pair(L, std::vector(Operands.begin(),
                                                             Operands.end()))];




From kremenek at apple.com  Fri Aug  8 19:05:26 2008
From: kremenek at apple.com (Ted Kremenek)
Date: Sat, 09 Aug 2008 00:05:26 -0000
Subject: [llvm-commits] [llvm] r54564 - /llvm/tags/checker/checker-75/
Message-ID: <200808090005.m7905Qhd022933@zion.cs.uiuc.edu>

Author: kremenek
Date: Fri Aug  8 19:05:26 2008
New Revision: 54564

URL: http://llvm.org/viewvc/llvm-project?rev=54564&view=rev
Log:
Tagging checker-75.

Added:
    llvm/tags/checker/checker-75/
      - copied from r54563, llvm/trunk/



From gordonhenriksen at mac.com  Fri Aug  8 20:53:28 2008
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Sat, 09 Aug 2008 01:53:28 -0000
Subject: [llvm-commits] [llvm] r54570 - in /llvm/trunk/test/CodeGen: CPP/
	Mips/
Message-ID: <200808090153.m791rSLQ025913@zion.cs.uiuc.edu>

Author: gordon
Date: Fri Aug  8 20:53:27 2008
New Revision: 54570

URL: http://llvm.org/viewvc/llvm-project?rev=54570&view=rev
Log:
Ignore output directories.

Modified:
    llvm/trunk/test/CodeGen/CPP/   (props changed)
    llvm/trunk/test/CodeGen/Mips/   (props changed)

Propchange: llvm/trunk/test/CodeGen/CPP/

------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug  8 20:53:27 2008
@@ -0,0 +1 @@
+Output

Propchange: llvm/trunk/test/CodeGen/Mips/

------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Aug  8 20:53:27 2008
@@ -0,0 +1 @@
+Output




From gordonhenriksen at mac.com  Fri Aug  8 20:55:52 2008
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Sat, 09 Aug 2008 01:55:52 -0000
Subject: [llvm-commits] [llvm] r54571 - in /llvm/trunk:
 bindings/ocaml/llvm/llvm.ml bindings/ocaml/llvm/llvm.mli
 bindings/ocaml/llvm/llvm_ocaml.c test/Bindings/Ocaml/vmcore.ml
Message-ID: <200808090155.m791tqSK026007@zion.cs.uiuc.edu>

Author: gordon
Date: Fri Aug  8 20:55:52 2008
New Revision: 54571

URL: http://llvm.org/viewvc/llvm-project?rev=54571&view=rev
Log:
[PR-2610] Adding Ocaml bindings for Switch::addCase.

Modified:
    llvm/trunk/bindings/ocaml/llvm/llvm.ml
    llvm/trunk/bindings/ocaml/llvm/llvm.mli
    llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c
    llvm/trunk/test/Bindings/Ocaml/vmcore.ml

Modified: llvm/trunk/bindings/ocaml/llvm/llvm.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.ml?rev=54571&r1=54570&r2=54571&view=diff

==============================================================================
--- llvm/trunk/bindings/ocaml/llvm/llvm.ml (original)
+++ llvm/trunk/bindings/ocaml/llvm/llvm.ml Fri Aug  8 20:55:52 2008
@@ -619,6 +619,8 @@
                          llvalue = "llvm_build_cond_br"
 external build_switch : llvalue -> llbasicblock -> int -> llbuilder -> llvalue
                       = "llvm_build_switch"
+external add_case : llvalue -> llvalue -> llbasicblock -> unit
+                  = "llvm_add_case"
 external build_invoke : llvalue -> llvalue array -> llbasicblock ->
                         llbasicblock -> string -> llbuilder -> llvalue
                       = "llvm_build_invoke_bc" "llvm_build_invoke_nat"

Modified: llvm/trunk/bindings/ocaml/llvm/llvm.mli
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.mli?rev=54571&r1=54570&r2=54571&view=diff

==============================================================================
--- llvm/trunk/bindings/ocaml/llvm/llvm.mli (original)
+++ llvm/trunk/bindings/ocaml/llvm/llvm.mli Fri Aug  8 20:55:52 2008
@@ -1212,13 +1212,20 @@
 external build_cond_br : llvalue -> llbasicblock -> llbasicblock -> llbuilder ->
                          llvalue = "llvm_build_cond_br"
 
-(** [build_switch case elsebb b] creates an empty
+(** [build_switch case elsebb count b] creates an empty
     [switch %case, %elsebb]
-    instruction at the position specified by the instruction builder [b].
+    instruction at the position specified by the instruction builder [b] with
+    space reserved for [count] cases.
     See the method [llvm::LLVMBuilder::CreateSwitch]. *)
 external build_switch : llvalue -> llbasicblock -> int -> llbuilder -> llvalue
                       = "llvm_build_switch"
 
+(** [add_case sw onval bb] causes switch instruction [sw] to branch to [bb]
+    when its input matches the constant [onval].
+    See the method [llvm::SwitchInst::addCase]. **)
+external add_case : llvalue -> llvalue -> llbasicblock -> unit
+                  = "llvm_add_case"
+
 (** [build_invoke fn args tobb unwindbb name b] creates an
     [%name = invoke %fn(args) to %tobb unwind %unwindbb]
     instruction at the position specified by the instruction builder [b].

Modified: llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c?rev=54571&r1=54570&r2=54571&view=diff

==============================================================================
--- llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c (original)
+++ llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c Fri Aug  8 20:55:52 2008
@@ -848,6 +848,13 @@
   return LLVMBuildSwitch(Builder_val(B), Of, Else, Int_val(EstimatedCount));
 }
 
+CAMLprim value llvm_add_case(LLVMValueRef Switch,
+                             LLVMValueRef OnVal,
+                             LLVMBasicBlockRef Dest) {
+  LLVMAddCase(Switch, OnVal, Dest);
+  return Val_unit;
+}
+
 /* llvalue -> llvalue array -> llbasicblock -> llbasicblock -> string ->
    llbuilder -> llvalue */
 CAMLprim LLVMValueRef llvm_build_invoke_nat(LLVMValueRef Fn, value Args,

Modified: llvm/trunk/test/Bindings/Ocaml/vmcore.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/vmcore.ml?rev=54571&r1=54570&r2=54571&view=diff

==============================================================================
--- llvm/trunk/test/Bindings/Ocaml/vmcore.ml (original)
+++ llvm/trunk/test/Bindings/Ocaml/vmcore.ml Fri Aug  8 20:55:52 2008
@@ -825,7 +825,18 @@
     ignore (build_cond_br cond bb03 bb00 b)
   end;
   
-  (* TODO: Switch *)
+  group "switch"; begin
+    (* RUN: grep {switch.*P1.*SwiBlock3} < %t.ll
+     * RUN: grep {2,.*SwiBlock2} < %t.ll
+     *)
+    let bb1 = append_block "SwiBlock1" fn in
+    let bb2 = append_block "SwiBlock2" fn in
+    ignore (build_unreachable (builder_at_end bb2));
+    let bb3 = append_block "SwiBlock3" fn in
+    ignore (build_unreachable (builder_at_end bb3));
+    let si = build_switch p1 bb3 1 (builder_at_end bb1) in
+    ignore (add_case si (const_int i32_type 2) bb2)
+  end;
   
   group "invoke"; begin
     (* RUN: grep {Inst02.*invoke.*P1.*P2} < %t.ll




From gordonhenriksen at mac.com  Fri Aug  8 21:13:58 2008
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Sat, 09 Aug 2008 02:13:58 -0000
Subject: [llvm-commits] [llvm] r54572 - in /llvm/trunk:
 bindings/ocaml/llvm/llvm.ml bindings/ocaml/llvm/llvm.mli
 include/llvm-c/Core.h lib/VMCore/Core.cpp
Message-ID: <200808090213.m792DxNu026556@zion.cs.uiuc.edu>

Author: gordon
Date: Fri Aug  8 21:13:58 2008
New Revision: 54572

URL: http://llvm.org/viewvc/llvm-project?rev=54572&view=rev
Log:
Delete a redundant binding, LLVMHasInitializer.

Please use !LLVMIsDeclaration instead.

Modified:
    llvm/trunk/bindings/ocaml/llvm/llvm.ml
    llvm/trunk/bindings/ocaml/llvm/llvm.mli
    llvm/trunk/include/llvm-c/Core.h
    llvm/trunk/lib/VMCore/Core.cpp

Modified: llvm/trunk/bindings/ocaml/llvm/llvm.ml
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.ml?rev=54572&r1=54571&r2=54572&view=diff

==============================================================================
--- llvm/trunk/bindings/ocaml/llvm/llvm.ml (original)
+++ llvm/trunk/bindings/ocaml/llvm/llvm.ml Fri Aug  8 21:13:58 2008
@@ -300,7 +300,6 @@
 external lookup_global : string -> llmodule -> llvalue option
                        = "llvm_lookup_global"
 external delete_global : llvalue -> unit = "llvm_delete_global"
-external has_initializer : llvalue -> bool = "llvm_has_initializer"
 external global_initializer : llvalue -> llvalue = "LLVMGetInitializer"
 external set_initializer : llvalue -> llvalue -> unit = "llvm_set_initializer"
 external remove_initializer : llvalue -> unit = "llvm_remove_initializer"

Modified: llvm/trunk/bindings/ocaml/llvm/llvm.mli
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.mli?rev=54572&r1=54571&r2=54572&view=diff

==============================================================================
--- llvm/trunk/bindings/ocaml/llvm/llvm.mli (original)
+++ llvm/trunk/bindings/ocaml/llvm/llvm.mli Fri Aug  8 21:13:58 2008
@@ -815,11 +815,6 @@
 external set_global_constant : bool -> llvalue -> unit
                              = "llvm_set_global_constant"
 
-(** [has_initializer gv] returns [true] if the global variable [gv] has an
-    initializer and [false] otherwise.
-    See the method [llvm::GlobalVariable::hasInitializer]. *)
-external has_initializer : llvalue -> bool = "llvm_has_initializer"
-
 (** [global_initializer gv] returns the initializer for the global variable
     [gv]. See the method [llvm::GlobalVariable::getInitializer]. *)
 external global_initializer : llvalue -> llvalue = "LLVMGetInitializer"

Modified: llvm/trunk/include/llvm-c/Core.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Core.h?rev=54572&r1=54571&r2=54572&view=diff

==============================================================================
--- llvm/trunk/include/llvm-c/Core.h (original)
+++ llvm/trunk/include/llvm-c/Core.h Fri Aug  8 21:13:58 2008
@@ -392,7 +392,6 @@
 LLVMValueRef LLVMGetNextGlobal(LLVMValueRef GlobalVar);
 LLVMValueRef LLVMGetPreviousGlobal(LLVMValueRef GlobalVar);
 void LLVMDeleteGlobal(LLVMValueRef GlobalVar);
-int LLVMHasInitializer(LLVMValueRef GlobalVar);
 LLVMValueRef LLVMGetInitializer(LLVMValueRef GlobalVar);
 void LLVMSetInitializer(LLVMValueRef GlobalVar, LLVMValueRef ConstantVal);
 int LLVMIsThreadLocal(LLVMValueRef GlobalVar);

Modified: llvm/trunk/lib/VMCore/Core.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Core.cpp?rev=54572&r1=54571&r2=54572&view=diff

==============================================================================
--- llvm/trunk/lib/VMCore/Core.cpp (original)
+++ llvm/trunk/lib/VMCore/Core.cpp Fri Aug  8 21:13:58 2008
@@ -632,10 +632,6 @@
   unwrap(GlobalVar)->eraseFromParent();
 }
 
-int LLVMHasInitializer(LLVMValueRef GlobalVar) {
-  return unwrap(GlobalVar)->hasInitializer();
-}
-
 LLVMValueRef LLVMGetInitializer(LLVMValueRef GlobalVar) {
   return wrap(unwrap(GlobalVar)->getInitializer());
 }




From nicholas at mxc.ca  Fri Aug  8 21:33:01 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sat, 09 Aug 2008 02:33:01 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54573 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Message-ID: <200808090233.m792X1fH027130@zion.cs.uiuc.edu>

Author: nicholas
Date: Fri Aug  8 21:33:01 2008
New Revision: 54573

URL: http://llvm.org/viewvc/llvm-project?rev=54573&view=rev
Log:
Don't return NULL here.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54573&r1=54572&r2=54573&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug  8 21:33:01 2008
@@ -6984,7 +6984,7 @@
                                                       Idx.size());
 
   if (ConstantExpr *CE = dyn_cast(ArrayRef))
-    return ConstantFoldConstantExpression(CE, &getTargetData());
+    return ConstantFoldConstantExpression(CE, &getTargetData()) || CE;
   else
     return ArrayRef;
 }




From nicholas at mxc.ca  Fri Aug  8 21:39:37 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Fri, 08 Aug 2008 19:39:37 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r54520 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <200808080950.33160.baldrick@free.fr>
References: <200808080700.m7870AkF003024@zion.cs.uiuc.edu>
	<200808080950.33160.baldrick@free.fr>
Message-ID: <489D0369.70104@mxc.ca>

Duncan Sands wrote:
> Hi Nick,
> 
>> +  if (ConstantExpr *CE = dyn_cast(ArrayRef))
>> +    return ConstantFoldConstantExpression(CE, &getTargetData());
> 
> in theory this method can return NULL (at least that's what
> the comment on it says).

Indeed, it can. Thanks for pointing that out.

Nick


From gordonhenriksen at mac.com  Fri Aug  8 22:48:47 2008
From: gordonhenriksen at mac.com (Gordon Henriksen)
Date: Sat, 09 Aug 2008 03:48:47 -0000
Subject: [llvm-commits] [llvm] r54574 -
	/llvm/trunk/lib/CodeGen/OcamlCollector.cpp
Message-ID: <200808090348.m793mmSk029156@zion.cs.uiuc.edu>

Author: gordon
Date: Fri Aug  8 22:48:46 2008
New Revision: 54574

URL: http://llvm.org/viewvc/llvm-project?rev=54574&view=rev
Log:
Fix some typos. Apparently I think C needs a power-of operator.

Modified:
    llvm/trunk/lib/CodeGen/OcamlCollector.cpp

Modified: llvm/trunk/lib/CodeGen/OcamlCollector.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/OcamlCollector.cpp?rev=54574&r1=54573&r2=54574&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/OcamlCollector.cpp (original)
+++ llvm/trunk/lib/CodeGen/OcamlCollector.cpp Fri Aug  8 22:48:46 2008
@@ -129,7 +129,7 @@
                                      PE = MD.end(); PI != PE; ++PI) {
       
       uint64_t FrameSize = MD.getFrameSize();
-      if (FrameSize >= 2<<16) {
+      if (FrameSize >= 1<<16) {
         cerr << "Function '" << MD.getFunction().getNameStart()
              << "' is too large for the ocaml collector! "
              << "Frame size " << FrameSize << " >= 65536.\n";
@@ -137,7 +137,7 @@
       }
       
       size_t LiveCount = MD.live_size(PI);
-      if (LiveCount >= 2<<16) {
+      if (LiveCount >= 1<<16) {
         cerr << "Function '" << MD.getFunction().getNameStart()
              << "' is too large for the ocaml collector! "
              << "Live root count " << LiveCount << " >= 65536.\n";
@@ -157,7 +157,7 @@
       for (CollectorMetadata::live_iterator LI = MD.live_begin(PI),
                                             LE = MD.live_end(PI);
                                             LI != LE; ++LI) {
-        assert(LI->StackOffset < 2<<16 &&
+        assert(LI->StackOffset < 1<<16 &&
                "GC root stack offset is outside of fixed stack frame and out "
                "of range for Ocaml collector!");
         




From nicholas at mxc.ca  Fri Aug  8 23:30:41 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sat, 09 Aug 2008 04:30:41 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54575 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
Message-ID: <200808090430.m794Ugw8030240@zion.cs.uiuc.edu>

Author: nicholas
Date: Fri Aug  8 23:30:40 2008
New Revision: 54575

URL: http://llvm.org/viewvc/llvm-project?rev=54575&view=rev
Log:
Apologies for checking in code that doesn't even compile.

Modified:
    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp

Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54575&r1=54574&r2=54575&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
+++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug  8 23:30:40 2008
@@ -6984,9 +6984,10 @@
                                                       Idx.size());
 
   if (ConstantExpr *CE = dyn_cast(ArrayRef))
-    return ConstantFoldConstantExpression(CE, &getTargetData()) || CE;
-  else
-    return ArrayRef;
+    if (Constant *C = ConstantFoldConstantExpression(CE, &getTargetData()))
+      return C;
+
+  return ArrayRef;
 }
 
 Constant *TreeConstantToLLVM::EmitLV_COMPONENT_REF(tree exp) {




From sabre at nondot.org  Sat Aug  9 01:25:47 2008
From: sabre at nondot.org (Chris Lattner)
Date: Sat, 09 Aug 2008 06:25:47 -0000
Subject: [llvm-commits] [llvm] r54576 - /llvm/trunk/include/llvm/Constant.h
Message-ID: <200808090625.m796PlZm001017@zion.cs.uiuc.edu>

Author: lattner
Date: Sat Aug  9 01:25:46 2008
New Revision: 54576

URL: http://llvm.org/viewvc/llvm-project?rev=54576&view=rev
Log:
comment update

Modified:
    llvm/trunk/include/llvm/Constant.h

Modified: llvm/trunk/include/llvm/Constant.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Constant.h?rev=54576&r1=54575&r2=54576&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Constant.h (original)
+++ llvm/trunk/include/llvm/Constant.h Sat Aug  9 01:25:46 2008
@@ -83,7 +83,8 @@
   
   /// getVectorElements - This method, which is only valid on constant of vector
   /// type, returns the elements of the vector in the specified smallvector.
-  /// This handles breaking down a vector undef into undef elements, etc.
+  /// This handles breaking down a vector undef into undef elements, etc.  For
+  /// constant exprs and other cases we can't handle, we return an empty vector.
   void getVectorElements(SmallVectorImpl &Elts) const;
 
   /// destroyConstant - Called if some element of this constant is no longer




From sabre at nondot.org  Sat Aug  9 01:26:23 2008
From: sabre at nondot.org (Chris Lattner)
Date: Sat, 09 Aug 2008 06:26:23 -0000
Subject: [llvm-commits] [llvm] r54577 -
	/llvm/trunk/include/llvm/Support/IRBuilder.h
Message-ID: <200808090626.m796QN8A001044@zion.cs.uiuc.edu>

Author: lattner
Date: Sat Aug  9 01:26:23 2008
New Revision: 54577

URL: http://llvm.org/viewvc/llvm-project?rev=54577&view=rev
Log:
Make 'Insert' set the name for Loads, instead of passing the name into the
LoadInst ctor, which causes std::string thrashing.

Modified:
    llvm/trunk/include/llvm/Support/IRBuilder.h

Modified: llvm/trunk/include/llvm/Support/IRBuilder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRBuilder.h?rev=54577&r1=54576&r2=54577&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Support/IRBuilder.h (original)
+++ llvm/trunk/include/llvm/Support/IRBuilder.h Sat Aug  9 01:26:23 2008
@@ -283,10 +283,10 @@
     return Insert(new FreeInst(Ptr));
   }
   LoadInst *CreateLoad(Value *Ptr, const char *Name = 0) {
-    return Insert(new LoadInst(Ptr, Name));
+    return Insert(new LoadInst(Ptr), Name);
   }
   LoadInst *CreateLoad(Value *Ptr, bool isVolatile, const char *Name = 0) {
-    return Insert(new LoadInst(Ptr, Name, isVolatile));
+    return Insert(new LoadInst(Ptr, 0, isVolatile), Name);
   }
   StoreInst *CreateStore(Value *Val, Value *Ptr, bool isVolatile = false) {
     return Insert(new StoreInst(Val, Ptr, isVolatile));
@@ -306,7 +306,7 @@
         return ConstantExpr::getGetElementPtr(PC, &IdxBegin[0], 
                                               IdxEnd - IdxBegin);
     }      
-    return(Insert(GetElementPtrInst::Create(Ptr, IdxBegin, IdxEnd), Name));
+    return Insert(GetElementPtrInst::Create(Ptr, IdxBegin, IdxEnd), Name);
   }
   Value *CreateGEP(Value *Ptr, Value *Idx, const char *Name = "") {
     if (Constant *PC = dyn_cast(Ptr))




From isanbard at gmail.com  Sat Aug  9 01:40:11 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 8 Aug 2008 23:40:11 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r54573 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <200808090233.m792X1fH027130@zion.cs.uiuc.edu>
References: <200808090233.m792X1fH027130@zion.cs.uiuc.edu>
Message-ID: <715F84AA-3F35-4DEA-BFAF-CA2DC2B03BF2@gmail.com>

On Aug 8, 2008, at 7:33 PM, Nick Lewycky wrote:

> Author: nicholas
> Date: Fri Aug  8 21:33:01 2008
> New Revision: 54573
>
> URL: http://llvm.org/viewvc/llvm-project?rev=54573&view=rev
> Log:
> Don't return NULL here.
>
> Modified:
>    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
>
> Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54573&r1=54572&r2=54573&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
> +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug  8 21:33:01 2008
> @@ -6984,7 +6984,7 @@
>                                                       Idx.size());
>
>   if (ConstantExpr *CE = dyn_cast(ArrayRef))
> -    return ConstantFoldConstantExpression(CE, &getTargetData());
> +    return ConstantFoldConstantExpression(CE, &getTargetData()) ||  
> CE;

This returns the result of the logical "or" statement. I.e., 1 or 0.

-bw



From isanbard at gmail.com  Sat Aug  9 01:40:51 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Fri, 8 Aug 2008 23:40:51 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r54575 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <200808090430.m794Ugw8030240@zion.cs.uiuc.edu>
References: <200808090430.m794Ugw8030240@zion.cs.uiuc.edu>
Message-ID: <898F7720-8FA6-49B2-AD5C-91B76D9BE5BD@gmail.com>

Ah! Ignore my last comment. Thanks!

-bw

On Aug 8, 2008, at 9:30 PM, Nick Lewycky wrote:

> Author: nicholas
> Date: Fri Aug  8 23:30:40 2008
> New Revision: 54575
>
> URL: http://llvm.org/viewvc/llvm-project?rev=54575&view=rev
> Log:
> Apologies for checking in code that doesn't even compile.
>
> Modified:
>    llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
>
> Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54575&r1=54574&r2=54575&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original)
> +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug  8 23:30:40 2008
> @@ -6984,9 +6984,10 @@
>                                                       Idx.size());
>
>   if (ConstantExpr *CE = dyn_cast(ArrayRef))
> -    return ConstantFoldConstantExpression(CE, &getTargetData()) ||  
> CE;
> -  else
> -    return ArrayRef;
> +    if (Constant *C = ConstantFoldConstantExpression(CE,  
> &getTargetData()))
> +      return C;
> +
> +  return ArrayRef;
> }
>
> Constant *TreeConstantToLLVM::EmitLV_COMPONENT_REF(tree exp) {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From baldrick at free.fr  Sat Aug  9 02:32:35 2008
From: baldrick at free.fr (Duncan Sands)
Date: Sat, 9 Aug 2008 09:32:35 +0200
Subject: [llvm-commits] [llvm-gcc-4.2] r54573 -
	/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp
In-Reply-To: <200808090233.m792X1fH027130@zion.cs.uiuc.edu>
References: <200808090233.m792X1fH027130@zion.cs.uiuc.edu>
Message-ID: <200808090932.36543.baldrick@free.fr>

Hi,

>    if (ConstantExpr *CE = dyn_cast(ArrayRef))
> -    return ConstantFoldConstantExpression(CE, &getTargetData());
> +    return ConstantFoldConstantExpression(CE, &getTargetData()) || CE;

this looks rather bogus.  How about just introducing a variable to
hold the result of the ConstantFoldConstantExpression, etc?

Ciao,

Duncan.


From nicholas at mxc.ca  Sat Aug  9 03:03:58 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sat, 09 Aug 2008 08:03:58 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54578 -
	/llvm-gcc-4.2/trunk/gcc/cppdefault.c
Message-ID: <200808090803.m7983wNe017634@zion.cs.uiuc.edu>

Author: nicholas
Date: Sat Aug  9 03:03:57 2008
New Revision: 54578

URL: http://llvm.org/viewvc/llvm-project?rev=54578&view=rev
Log:
Restore Rafael's changes in r53455. (Heads up for Bill, please don't clobber!)


Modified:
    llvm-gcc-4.2/trunk/gcc/cppdefault.c

Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=54578&r1=54577&r2=54578&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Sat Aug  9 03:03:57 2008
@@ -46,6 +46,11 @@
 /* APPLE LOCAL begin SDK 3886137.  */
 /* Allow -isysroot to override ALL  include patchs. This is done by
    setting add_sysroot for all default inclue paths.  */
+#ifdef CONFIG_DARWIN_H
+#define ADD_SYSROOT 1
+#else
+#define ADD_SYSROOT 0
+#endif
 const struct default_include cpp_include_defaults[]
 #ifdef INCLUDE_DEFAULTS
 = INCLUDE_DEFAULTS;
@@ -53,34 +58,34 @@
 = {
 #ifdef GPLUSPLUS_INCLUDE_DIR
     /* Pick up GNU C++ generic include files.  */
-    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 },
+    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 },
 #endif
 #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
     /* Pick up GNU C++ target-dependent include files.  */
-    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 1, 1 },
+    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 1 },
 #endif
 #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
     /* Pick up GNU C++ backward and deprecated include files.  */
-    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1, 0 },
+    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 },
 #endif
 #ifdef LOCAL_INCLUDE_DIR
     /* /usr/local/include comes before the fixincluded header files.  */
     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
 #endif
 #ifdef PREFIX_INCLUDE_DIR
-    { PREFIX_INCLUDE_DIR, 0, 0, 1, 1, 0 },
+    { PREFIX_INCLUDE_DIR, 0, 0, 1, ADD_SYSROOT, 0 },
 #endif
 #ifdef GCC_INCLUDE_DIR
     /* This is the dir for fixincludes and for gcc's private headers.  */
-    { GCC_INCLUDE_DIR, "GCC", 0, 0, 1, 0 },
+    { GCC_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 },
 #endif
 #ifdef CROSS_INCLUDE_DIR
     /* One place the target system's headers might be.  */
-    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 1, 0 },
+    { CROSS_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 },
 #endif
 #ifdef TOOL_INCLUDE_DIR
     /* Another place the target system's headers might be.  */
-    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 1, 0 },
+    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, ADD_SYSROOT, 0 },
 #endif
 #ifdef SYSTEM_INCLUDE_DIR
     /* Some systems have an extra dir of include files.  */
@@ -94,6 +99,7 @@
   };
 #endif /* no INCLUDE_DEFAULTS */
 
+#undef ADD_SYSROOT
 /* APPLE LOCAL end SDK 3886137.  */
 
 #ifdef GCC_INCLUDE_DIR




From isanbard at gmail.com  Sat Aug  9 04:06:45 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Sat, 9 Aug 2008 02:06:45 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r54578 -
	/llvm-gcc-4.2/trunk/gcc/cppdefault.c
In-Reply-To: <200808090803.m7983wNe017634@zion.cs.uiuc.edu>
References: <200808090803.m7983wNe017634@zion.cs.uiuc.edu>
Message-ID: <653A1699-1988-48A0-95B8-5565DBA02871@gmail.com>

Sorry for reverting them before. Could you go through and put "LLVM  
LOCAL" comments before these changes? That way I won't do that  
again. :-)

-bw

On Aug 9, 2008, at 1:03 AM, Nick Lewycky wrote:

> Author: nicholas
> Date: Sat Aug  9 03:03:57 2008
> New Revision: 54578
>
> URL: http://llvm.org/viewvc/llvm-project?rev=54578&view=rev
> Log:
> Restore Rafael's changes in r53455. (Heads up for Bill, please don't  
> clobber!)
>
>
> Modified:
>    llvm-gcc-4.2/trunk/gcc/cppdefault.c
>
> Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c
> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=54578&r1=54577&r2=54578&view=diff
>
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> = 
> ======================================================================
> --- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original)
> +++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Sat Aug  9 03:03:57 2008
> @@ -46,6 +46,11 @@
> /* APPLE LOCAL begin SDK 3886137.  */
> /* Allow -isysroot to override ALL  include patchs. This is done by
>    setting add_sysroot for all default inclue paths.  */
> +#ifdef CONFIG_DARWIN_H
> +#define ADD_SYSROOT 1
> +#else
> +#define ADD_SYSROOT 0
> +#endif
> const struct default_include cpp_include_defaults[]
> #ifdef INCLUDE_DEFAULTS
> = INCLUDE_DEFAULTS;
> @@ -53,34 +58,34 @@
> = {
> #ifdef GPLUSPLUS_INCLUDE_DIR
>     /* Pick up GNU C++ generic include files.  */
> -    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 },
> +    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 },
> #endif
> #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
>     /* Pick up GNU C++ target-dependent include files.  */
> -    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 1, 1 },
> +    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 1 },
> #endif
> #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
>     /* Pick up GNU C++ backward and deprecated include files.  */
> -    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1, 0 },
> +    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 },
> #endif
> #ifdef LOCAL_INCLUDE_DIR
>     /* /usr/local/include comes before the fixincluded header  
> files.  */
>     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
> #endif
> #ifdef PREFIX_INCLUDE_DIR
> -    { PREFIX_INCLUDE_DIR, 0, 0, 1, 1, 0 },
> +    { PREFIX_INCLUDE_DIR, 0, 0, 1, ADD_SYSROOT, 0 },
> #endif
> #ifdef GCC_INCLUDE_DIR
>     /* This is the dir for fixincludes and for gcc's private  
> headers.  */
> -    { GCC_INCLUDE_DIR, "GCC", 0, 0, 1, 0 },
> +    { GCC_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 },
> #endif
> #ifdef CROSS_INCLUDE_DIR
>     /* One place the target system's headers might be.  */
> -    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 1, 0 },
> +    { CROSS_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 },
> #endif
> #ifdef TOOL_INCLUDE_DIR
>     /* Another place the target system's headers might be.  */
> -    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 1, 0 },
> +    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, ADD_SYSROOT, 0 },
> #endif
> #ifdef SYSTEM_INCLUDE_DIR
>     /* Some systems have an extra dir of include files.  */
> @@ -94,6 +99,7 @@
>   };
> #endif /* no INCLUDE_DEFAULTS */
>
> +#undef ADD_SYSROOT
> /* APPLE LOCAL end SDK 3886137.  */
>
> #ifdef GCC_INCLUDE_DIR
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From cedric.venet at laposte.net  Sat Aug  9 06:57:41 2008
From: cedric.venet at laposte.net (Cedric Venet)
Date: Sat, 09 Aug 2008 11:57:41 -0000
Subject: [llvm-commits] [llvm] r54580 -
	/llvm/trunk/win32/CodeGen/CodeGen.vcproj
Message-ID: <200808091157.m79BvfoQ024306@zion.cs.uiuc.edu>

Author: venet
Date: Sat Aug  9 06:57:39 2008
New Revision: 54580

URL: http://llvm.org/viewvc/llvm-project?rev=54580&view=rev
Log:
update VS project.

Modified:
    llvm/trunk/win32/CodeGen/CodeGen.vcproj

Modified: llvm/trunk/win32/CodeGen/CodeGen.vcproj
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/CodeGen/CodeGen.vcproj?rev=54580&r1=54579&r2=54580&view=diff

==============================================================================
--- llvm/trunk/win32/CodeGen/CodeGen.vcproj (original)
+++ llvm/trunk/win32/CodeGen/CodeGen.vcproj Sat Aug  9 06:57:39 2008
@@ -560,6 +560,10 @@
 					>
 				
 				
+				
+				
 				
@@ -751,6 +755,10 @@
 				>
 			
 			
+			
+			
 			




From baldrick at free.fr  Sat Aug  9 10:15:03 2008
From: baldrick at free.fr (Duncan Sands)
Date: Sat, 09 Aug 2008 15:15:03 -0000
Subject: [llvm-commits] [llvm] r54581 -
	/llvm/trunk/include/llvm/Support/IRBuilder.h
Message-ID: <200808091515.m79FF3N5029936@zion.cs.uiuc.edu>

Author: baldrick
Date: Sat Aug  9 10:14:59 2008
New Revision: 54581

URL: http://llvm.org/viewvc/llvm-project?rev=54581&view=rev
Log:
Unbreak the llvm-gcc build: recent changes to
IRBuilder are not expecting null names.

Modified:
    llvm/trunk/include/llvm/Support/IRBuilder.h

Modified: llvm/trunk/include/llvm/Support/IRBuilder.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRBuilder.h?rev=54581&r1=54580&r2=54581&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Support/IRBuilder.h (original)
+++ llvm/trunk/include/llvm/Support/IRBuilder.h Sat Aug  9 10:14:59 2008
@@ -282,10 +282,10 @@
   FreeInst *CreateFree(Value *Ptr) {
     return Insert(new FreeInst(Ptr));
   }
-  LoadInst *CreateLoad(Value *Ptr, const char *Name = 0) {
+  LoadInst *CreateLoad(Value *Ptr, const char *Name = "") {
     return Insert(new LoadInst(Ptr), Name);
   }
-  LoadInst *CreateLoad(Value *Ptr, bool isVolatile, const char *Name = 0) {
+  LoadInst *CreateLoad(Value *Ptr, bool isVolatile, const char *Name = "") {
     return Insert(new LoadInst(Ptr, 0, isVolatile), Name);
   }
   StoreInst *CreateStore(Value *Val, Value *Ptr, bool isVolatile = false) {




From nicholas at mxc.ca  Sat Aug  9 10:46:44 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sat, 09 Aug 2008 15:46:44 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54582 -
	/llvm-gcc-4.2/trunk/gcc/cppdefault.c
Message-ID: <200808091546.m79Fki2O030755@zion.cs.uiuc.edu>

Author: nicholas
Date: Sat Aug  9 10:46:38 2008
New Revision: 54582

URL: http://llvm.org/viewvc/llvm-project?rev=54582&view=rev
Log:
Mark LLVM LOCAL changes.

Modified:
    llvm-gcc-4.2/trunk/gcc/cppdefault.c

Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=54582&r1=54581&r2=54582&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Sat Aug  9 10:46:38 2008
@@ -46,6 +46,7 @@
 /* APPLE LOCAL begin SDK 3886137.  */
 /* Allow -isysroot to override ALL  include patchs. This is done by
    setting add_sysroot for all default inclue paths.  */
+/* LLVM LOCAL begin - fix sysroot on non-Darwin systems */
 #ifdef CONFIG_DARWIN_H
 #define ADD_SYSROOT 1
 #else
@@ -100,6 +101,7 @@
 #endif /* no INCLUDE_DEFAULTS */
 
 #undef ADD_SYSROOT
+/* LLVM local end */
 /* APPLE LOCAL end SDK 3886137.  */
 
 #ifdef GCC_INCLUDE_DIR




From nicholas at mxc.ca  Sat Aug  9 10:47:27 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sat, 09 Aug 2008 08:47:27 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r54578
	-	/llvm-gcc-4.2/trunk/gcc/cppdefault.c
In-Reply-To: <653A1699-1988-48A0-95B8-5565DBA02871@gmail.com>
References: <200808090803.m7983wNe017634@zion.cs.uiuc.edu>
	<653A1699-1988-48A0-95B8-5565DBA02871@gmail.com>
Message-ID: <489DBC0F.6050708@mxc.ca>

Bill Wendling wrote:
> Sorry for reverting them before. Could you go through and put "LLVM  
> LOCAL" comments before these changes? That way I won't do that  
> again. :-)

Sounds like good advice to me! :-) Thanks!

Nick

> -bw
> 
> On Aug 9, 2008, at 1:03 AM, Nick Lewycky wrote:
> 
>> Author: nicholas
>> Date: Sat Aug  9 03:03:57 2008
>> New Revision: 54578
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=54578&view=rev
>> Log:
>> Restore Rafael's changes in r53455. (Heads up for Bill, please don't  
>> clobber!)
>>
>>
>> Modified:
>>    llvm-gcc-4.2/trunk/gcc/cppdefault.c
>>
>> Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c
>> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=54578&r1=54577&r2=54578&view=diff
>>
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> = 
>> ======================================================================
>> --- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original)
>> +++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Sat Aug  9 03:03:57 2008
>> @@ -46,6 +46,11 @@
>> /* APPLE LOCAL begin SDK 3886137.  */
>> /* Allow -isysroot to override ALL  include patchs. This is done by
>>    setting add_sysroot for all default inclue paths.  */
>> +#ifdef CONFIG_DARWIN_H
>> +#define ADD_SYSROOT 1
>> +#else
>> +#define ADD_SYSROOT 0
>> +#endif
>> const struct default_include cpp_include_defaults[]
>> #ifdef INCLUDE_DEFAULTS
>> = INCLUDE_DEFAULTS;
>> @@ -53,34 +58,34 @@
>> = {
>> #ifdef GPLUSPLUS_INCLUDE_DIR
>>     /* Pick up GNU C++ generic include files.  */
>> -    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 },
>> +    { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 },
>> #endif
>> #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR
>>     /* Pick up GNU C++ target-dependent include files.  */
>> -    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 1, 1 },
>> +    { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 1 },
>> #endif
>> #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR
>>     /* Pick up GNU C++ backward and deprecated include files.  */
>> -    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1, 0 },
>> +    { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 },
>> #endif
>> #ifdef LOCAL_INCLUDE_DIR
>>     /* /usr/local/include comes before the fixincluded header  
>> files.  */
>>     { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 },
>> #endif
>> #ifdef PREFIX_INCLUDE_DIR
>> -    { PREFIX_INCLUDE_DIR, 0, 0, 1, 1, 0 },
>> +    { PREFIX_INCLUDE_DIR, 0, 0, 1, ADD_SYSROOT, 0 },
>> #endif
>> #ifdef GCC_INCLUDE_DIR
>>     /* This is the dir for fixincludes and for gcc's private  
>> headers.  */
>> -    { GCC_INCLUDE_DIR, "GCC", 0, 0, 1, 0 },
>> +    { GCC_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 },
>> #endif
>> #ifdef CROSS_INCLUDE_DIR
>>     /* One place the target system's headers might be.  */
>> -    { CROSS_INCLUDE_DIR, "GCC", 0, 0, 1, 0 },
>> +    { CROSS_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 },
>> #endif
>> #ifdef TOOL_INCLUDE_DIR
>>     /* Another place the target system's headers might be.  */
>> -    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 1, 0 },
>> +    { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, ADD_SYSROOT, 0 },
>> #endif
>> #ifdef SYSTEM_INCLUDE_DIR
>>     /* Some systems have an extra dir of include files.  */
>> @@ -94,6 +99,7 @@
>>   };
>> #endif /* no INCLUDE_DEFAULTS */
>>
>> +#undef ADD_SYSROOT
>> /* APPLE LOCAL end SDK 3886137.  */
>>
>> #ifdef GCC_INCLUDE_DIR
>>
>>
>> _______________________________________________
>> llvm-commits mailing list
>> llvm-commits at cs.uiuc.edu
>> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
> 



From clattner at apple.com  Sat Aug  9 12:04:29 2008
From: clattner at apple.com (Chris Lattner)
Date: Sat, 9 Aug 2008 10:04:29 -0700
Subject: [llvm-commits] [llvm] r54581 -
	/llvm/trunk/include/llvm/Support/IRBuilder.h
In-Reply-To: <200808091515.m79FF3N5029936@zion.cs.uiuc.edu>
References: <200808091515.m79FF3N5029936@zion.cs.uiuc.edu>
Message-ID: 


On Aug 9, 2008, at 8:15 AM, Duncan Sands wrote:

> Author: baldrick
> Date: Sat Aug  9 10:14:59 2008
> New Revision: 54581
>
> URL: http://llvm.org/viewvc/llvm-project?rev=54581&view=rev
> Log:
> Unbreak the llvm-gcc build: recent changes to
> IRBuilder are not expecting null names.

Doh, sorry :(.

-Chris

>
>
> Modified:
>    llvm/trunk/include/llvm/Support/IRBuilder.h
>
> Modified: llvm/trunk/include/llvm/Support/IRBuilder.h
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRBuilder.h?rev=54581&r1=54580&r2=54581&view=diff
>
> =
> =
> =
> =
> =
> =
> =
> =
> ======================================================================
> --- llvm/trunk/include/llvm/Support/IRBuilder.h (original)
> +++ llvm/trunk/include/llvm/Support/IRBuilder.h Sat Aug  9 10:14:59  
> 2008
> @@ -282,10 +282,10 @@
>   FreeInst *CreateFree(Value *Ptr) {
>     return Insert(new FreeInst(Ptr));
>   }
> -  LoadInst *CreateLoad(Value *Ptr, const char *Name = 0) {
> +  LoadInst *CreateLoad(Value *Ptr, const char *Name = "") {
>     return Insert(new LoadInst(Ptr), Name);
>   }
> -  LoadInst *CreateLoad(Value *Ptr, bool isVolatile, const char  
> *Name = 0) {
> +  LoadInst *CreateLoad(Value *Ptr, bool isVolatile, const char  
> *Name = "") {
>     return Insert(new LoadInst(Ptr, 0, isVolatile), Name);
>   }
>   StoreInst *CreateStore(Value *Val, Value *Ptr, bool isVolatile =  
> false) {
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits



From nicholas at mxc.ca  Sat Aug  9 12:08:49 2008
From: nicholas at mxc.ca (Nick Lewycky)
Date: Sat, 09 Aug 2008 17:08:49 -0000
Subject: [llvm-commits] [llvm-gcc-4.2] r54586 - in
 /llvm-gcc-4.2/trunk/gcc/cp: cp-tree.h decl2.c lex.c pt.c
Message-ID: <200808091708.m79H8nWL000934@zion.cs.uiuc.edu>

Author: nicholas
Date: Sat Aug  9 12:08:49 2008
New Revision: 54586

URL: http://llvm.org/viewvc/llvm-project?rev=54586&view=rev
Log:
Reinstate clobbered r53456, this time with LLVM LOCAL notices.
Note that it's not really llvm local, since it's a backport of FSF GCC changes.

Modified:
    llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h
    llvm-gcc-4.2/trunk/gcc/cp/decl2.c
    llvm-gcc-4.2/trunk/gcc/cp/lex.c
    llvm-gcc-4.2/trunk/gcc/cp/pt.c

Modified: llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h?rev=54586&r1=54585&r2=54586&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h Sat Aug  9 12:08:49 2008
@@ -4155,6 +4155,9 @@
 extern void yyhook				(int);
 extern bool cxx_init				(void);
 extern void cxx_finish				(void);
+/* LLVM LOCAL begin - Fix for GCC PR c++/29365 */
+extern bool in_main_input_context		(void);
+/* LLVM LOCAL end */
 
 /* in method.c */
 extern void init_method				(void);
@@ -4237,6 +4240,9 @@
 extern bool reregister_specialization		(tree, tree, tree);
 extern tree fold_non_dependent_expr		(tree);
 extern bool explicit_class_specialization_p     (tree);
+/* LLVM LOCAL begin - Fix for GCC PR c++/29365 */
+extern tree outermost_tinst_level		(void);
+/* LLVM LOCAL end */
 
 /* in repo.c */
 extern void init_repo				(void);

Modified: llvm-gcc-4.2/trunk/gcc/cp/decl2.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/decl2.c?rev=54586&r1=54585&r2=54586&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/decl2.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/decl2.c Sat Aug  9 12:08:49 2008
@@ -1893,9 +1893,14 @@
 	int subvis = type_visibility (ftype);
 
 	if (subvis == VISIBILITY_ANON)
-	  warning (0, "\
+          /* LLVM LOCAL begin - Fix for GCC PR c++/29365 */
+	  {
+	    if (!in_main_input_context ())
+	      warning (0, "\
 %qT has a field %qD whose type uses the anonymous namespace",
 		   type, t);
+	  }
+	  /* LLVM LOCAL end */
 	else if (IS_AGGR_TYPE (ftype)
 		 && vis < VISIBILITY_HIDDEN
 		 && subvis >= VISIBILITY_HIDDEN)
@@ -1910,9 +1915,14 @@
       int subvis = type_visibility (TREE_TYPE (t));
 
       if (subvis == VISIBILITY_ANON)
-	warning (0, "\
+        /* LLVM LOCAL begin - Fix for GCC PR c++/29365 */
+        {
+	  if (!in_main_input_context())
+	    warning (0, "\
 %qT has a base %qT whose type uses the anonymous namespace",
 		 type, TREE_TYPE (t));
+	}
+      /* LLVM LOCAL end */
       else if (vis < VISIBILITY_HIDDEN
 	       && subvis >= VISIBILITY_HIDDEN)
 	warning (OPT_Wattributes, "\

Modified: llvm-gcc-4.2/trunk/gcc/cp/lex.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/lex.c?rev=54586&r1=54585&r2=54586&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/lex.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/lex.c Sat Aug  9 12:08:49 2008
@@ -877,3 +877,20 @@
 
   return t;
 }
+
+/* LLVM LOCAL begin - Fix for GCC PR c++/29365 */
+/* Returns true if we are currently in the main source file, or in a
+   template instantiation started from the main source file.  */
+
+bool
+in_main_input_context (void)
+{
+  tree tl = outermost_tinst_level();
+
+  if (tl)
+    return strcmp (main_input_filename,
+		   LOCATION_FILE (TINST_LOCATION (tl))) == 0;
+  else
+    return strcmp (main_input_filename, input_filename) == 0;
+}
+/* LLVM LOCAL end */

Modified: llvm-gcc-4.2/trunk/gcc/cp/pt.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/pt.c?rev=54586&r1=54585&r2=54586&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/cp/pt.c (original)
+++ llvm-gcc-4.2/trunk/gcc/cp/pt.c Sat Aug  9 12:08:49 2008
@@ -5288,6 +5288,17 @@
   pop_tinst_level ();
 }
 
+/* LLVM LOCAL begin - Fix for GCC PR c++/29365 */
+/* Returns the TINST_LEVEL which gives the original instantiation
+   context.  */
+
+tree
+outermost_tinst_level (void)
+{
+  return tree_last (current_tinst_level);
+}
+/* LLVM LOCAL end */
+
 /* DECL is a friend FUNCTION_DECL or TEMPLATE_DECL.  ARGS is the
    vector of template arguments, as for tsubst.
 




From sabre at nondot.org  Sat Aug  9 12:23:35 2008
From: sabre at nondot.org (Chris Lattner)
Date: Sat, 09 Aug 2008 17:23:35 -0000
Subject: [llvm-commits] [llvm] r54589 - in /llvm/trunk:
 include/llvm/Analysis/SparsePropagation.h
 lib/Analysis/SparsePropagation.cpp
Message-ID: <200808091723.m79HNZMq001367@zion.cs.uiuc.edu>

Author: lattner
Date: Sat Aug  9 12:23:35 2008
New Revision: 54589

URL: http://llvm.org/viewvc/llvm-project?rev=54589&view=rev
Log:
"This patch adds a virtual call to AbstractLatticeFunction to derive a 
type lattice value for an Argument*, giving clients the opportunity to
use something other than Top for it if they choose to."

Patch by John McCall!


Modified:
    llvm/trunk/include/llvm/Analysis/SparsePropagation.h
    llvm/trunk/lib/Analysis/SparsePropagation.cpp

Modified: llvm/trunk/include/llvm/Analysis/SparsePropagation.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/SparsePropagation.h?rev=54589&r1=54588&r2=54589&view=diff

==============================================================================
--- llvm/trunk/include/llvm/Analysis/SparsePropagation.h (original)
+++ llvm/trunk/include/llvm/Analysis/SparsePropagation.h Sat Aug  9 12:23:35 2008
@@ -24,6 +24,7 @@
 namespace llvm {
   class Value;
   class Constant;
+  class Argument;
   class Instruction;
   class PHINode;
   class TerminatorInst;
@@ -75,6 +76,12 @@
   virtual Constant *GetConstant(LatticeVal LV, Value *Val, SparseSolver &SS) {
     return 0;
   }
+
+  /// ComputeArgument - Given a formal argument value, compute and return a
+  /// lattice value corresponding to the specified argument.
+  virtual LatticeVal ComputeArgument(Argument *I) {
+    return getOverdefinedVal(); // always safe
+  }
   
   /// MergeValues - Compute and return the merge of the two specified lattice
   /// values.  Merging should only move one direction down the lattice to

Modified: llvm/trunk/lib/Analysis/SparsePropagation.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/SparsePropagation.cpp?rev=54589&r1=54588&r2=54589&view=diff

==============================================================================
--- llvm/trunk/lib/Analysis/SparsePropagation.cpp (original)
+++ llvm/trunk/lib/Analysis/SparsePropagation.cpp Sat Aug  9 12:23:35 2008
@@ -57,8 +57,10 @@
     return LatticeFunc->getUntrackedVal();
   else if (Constant *C = dyn_cast(V))
     LV = LatticeFunc->ComputeConstant(C);
+  else if (Argument *A = dyn_cast(V))
+    LV = LatticeFunc->ComputeArgument(A);
   else if (!isa(V))
-    // Non-instructions (e.g. formal arguments) are overdefined.
+    // All other non-instructions are overdefined.
     LV = LatticeFunc->getOverdefinedVal();
   else
     // All instructions are underdefined by default.




From isanbard at gmail.com  Sat Aug  9 16:52:06 2008
From: isanbard at gmail.com (Bill Wendling)
Date: Sat, 9 Aug 2008 14:52:06 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r54586 - in
	/llvm-gcc-4.2/trunk/gcc/cp: cp-tree.h decl2.c lex.c pt.c
In-Reply-To: <200808091708.m79H8nWL000934@zion.cs.uiuc.edu>
References: <200808091708.m79H8nWL000934@zion.cs.uiuc.edu>
Message-ID: <282FCCED-8EA4-43DF-B696-EFB3D9B6E07C@gmail.com>

On Aug 9, 2008, at 10:08 AM, Nick Lewycky wrote:

> Author: nicholas
> Date: Sat Aug  9 12:08:49 2008
> New Revision: 54586
>
> URL: http://llvm.org/viewvc/llvm-project?rev=54586&view=rev
> Log:
> Reinstate clobbered r53456, this time with LLVM LOCAL notices.
> Note that it's not really llvm local, since it's a backport of FSF  
> GCC changes.

Thanks! And you're right that it's not really llvm local in the normal  
sense. But it will help distinguish between those changes in Apple's  
GCC and our branch.

Sorry for clobbering r53456.

-bw


From echristo at apple.com  Sat Aug  9 17:41:45 2008
From: echristo at apple.com (Eric Christopher)
Date: Sat, 09 Aug 2008 15:41:45 -0700
Subject: [llvm-commits] [llvm-gcc-4.2] r54586 - in
 /llvm-gcc-4.2/trunk/gcc/cp: cp-tree.h decl2.c lex.c pt.c
In-Reply-To: <282FCCED-8EA4-43DF-B696-EFB3D9B6E07C@gmail.com>
References: <200808091708.m79H8nWL000934@zion.cs.uiuc.edu>
	<282FCCED-8EA4-43DF-B696-EFB3D9B6E07C@gmail.com>
Message-ID: <6CF40073-47F1-4816-A0A7-EFB0524B051A@apple.com>

I told Nicholas I'd put it into our 4.2 branch. :)

Sent from my iPhone

On Aug 9, 2008, at 2:52 PM, Bill Wendling  wrote:

> On Aug 9, 2008, at 10:08 AM, Nick Lewycky wrote:
>
>> Author: nicholas
>> Date: Sat Aug  9 12:08:49 2008
>> New Revision: 54586
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=54586&view=rev
>> Log:
>> Reinstate clobbered r53456, this time with LLVM LOCAL notices.
>> Note that it's not really llvm local, since it's a backport of FSF
>> GCC changes.
>
> Thanks! And you're right that it's not really llvm local in the normal
> sense. But it will help distinguish between those changes in Apple's
> GCC and our branch.
>
> Sorry for clobbering r53456.
>
> -bw
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits


From sabre at nondot.org  Sat Aug  9 19:47:21 2008
From: sabre at nondot.org (Chris Lattner)
Date: Sun, 10 Aug 2008 00:47:21 -0000
Subject: [llvm-commits] [llvm] r54602 - /llvm/trunk/lib/Target/README.txt
Message-ID: <200808100047.m7A0lLMs014579@zion.cs.uiuc.edu>

Author: lattner
Date: Sat Aug  9 19:47:21 2008
New Revision: 54602

URL: http://llvm.org/viewvc/llvm-project?rev=54602&view=rev
Log:
add a note

Modified:
    llvm/trunk/lib/Target/README.txt

Modified: llvm/trunk/lib/Target/README.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=54602&r1=54601&r2=54602&view=diff

==============================================================================
--- llvm/trunk/lib/Target/README.txt (original)
+++ llvm/trunk/lib/Target/README.txt Sat Aug  9 19:47:21 2008
@@ -438,6 +438,19 @@
 
 //===---------------------------------------------------------------------===//
 
+Tail recursion elimination should handle:
+
+int pow2m1(int n) {
+ if (n == 0)
+   return 0;
+ return 2 * pow2m1 (n - 1) + 1;
+}
+
+Also, multiplies can be turned into SHL's, so they should be handled as if
+they were associative.  "return foo() << 1" can be tail recursion eliminated.
+
+//===---------------------------------------------------------------------===//
+
 Argument promotion should promote arguments for recursive functions, like 
 this:
 




From sabre at nondot.org  Sat Aug  9 20:14:09 2008
From: sabre at nondot.org (Chris Lattner)
Date: Sun, 10 Aug 2008 01:14:09 -0000
Subject: [llvm-commits] [llvm] r54603 - /llvm/trunk/lib/Target/README.txt
Message-ID: <200808100114.m7A1E9AU015322@zion.cs.uiuc.edu>

Author: lattner
Date: Sat Aug  9 20:14:08 2008
New Revision: 54603

URL: http://llvm.org/viewvc/llvm-project?rev=54603&view=rev
Log:
move some more stuff out of my email into readme.txt

Modified:
    llvm/trunk/lib/Target/README.txt

Modified: llvm/trunk/lib/Target/README.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=54603&r1=54602&r2=54603&view=diff

==============================================================================
--- llvm/trunk/lib/Target/README.txt (original)
+++ llvm/trunk/lib/Target/README.txt Sat Aug  9 20:14:08 2008
@@ -809,3 +809,76 @@
 
 //===---------------------------------------------------------------------===//
 
+We generate a horrible  libcall for llvm.powi.  For example, we compile:
+
+#include 
+double f(double a) { return std::pow(a, 4); }
+
+into:
+
+__Z1fd:
+	subl	$12, %esp
+	movsd	16(%esp), %xmm0
+	movsd	%xmm0, (%esp)
+	movl	$4, 8(%esp)
+	call	L___powidf2$stub
+	addl	$12, %esp
+	ret
+
+GCC produces:
+
+__Z1fd:
+	subl	$12, %esp
+	movsd	16(%esp), %xmm0
+	mulsd	%xmm0, %xmm0
+	mulsd	%xmm0, %xmm0
+	movsd	%xmm0, (%esp)
+	fldl	(%esp)
+	addl	$12, %esp
+	ret
+
+//===---------------------------------------------------------------------===//
+
+We compile this program: (from GCC PR11680)
+http://gcc.gnu.org/bugzilla/attachment.cgi?id=4487
+
+Into code that runs the same speed in fast/slow modes, but both modes run 2x
+slower than when compile with GCC (either 4.0 or 4.2):
+
+$ llvm-g++ perf.cpp -O3 -fno-exceptions
+$ time ./a.out fast
+1.821u 0.003s 0:01.82 100.0%	0+0k 0+0io 0pf+0w
+
+$ g++ perf.cpp -O3 -fno-exceptions
+$ time ./a.out fast
+0.821u 0.001s 0:00.82 100.0%	0+0k 0+0io 0pf+0w
+
+It looks like we are making the same inlining decisions, so this may be raw
+codegen badness or something else (haven't investigated).
+
+//===---------------------------------------------------------------------===//
+
+We miss some instcombines for stuff like this:
+void bar (void);
+void foo (unsigned int a) {
+  /* This one is equivalent to a >= (3 << 2).  */
+  if ((a >> 2) >= 3)
+    bar ();
+}
+
+A few other related ones are in GCC PR14753.
+
+//===---------------------------------------------------------------------===//
+
+Divisibility by constant can be simplified (according to GCC PR12849) from
+being a mulhi to being a mul lo (cheaper).  Testcase:
+
+void bar(unsigned n) {
+  if (n % 3 == 0)
+    true();
+}
+
+I think this basically amounts to a dag combine to simplify comparisons against
+multiply hi's into a comparison against the mullo.
+
+//===---------------------------------------------------------------------===//







Media	Who	Description
[Video]
[Video Hi] + [Video Lo]	Chris Lattner Apple Inc.	Chris Lattner Apple, Inc.	Welcome and Thanks - A brief welcome, thanks and some logistics for the day.
[Slides] [Video]	Steve Naroff Apple Inc.	Steve Naroff Apple, Inc.	Clang Internals - Clang status, design and architecture.
[Slides] [Video]	Dan Gohman Apple Inc.	Dan Gohman Apple, Inc.	CodeGen Overview and Focus on SelectionDAGs - A high-level overview of the LLVM Code Generator, with specific depth and overview in the area of the SelectionDAG phases. @@ -58,7 +59,7 @@
[Slides] [Video]	Evan Cheng Apple Inc.	Evan Cheng Apple, Inc.	LLVM Register Allocation - Description of the current design and architecture of the LLVM register allocator. The talk discusses some optimizations that are currently performed as well as describing future @@ -66,8 +67,10 @@
[Slides] [Video]	Nate Begeman Apple Inc.
[Slides] + [Video Hi] + [Video Lo]	Nate Begeman Apple, Inc.	Building an Efficient JIT - LLVM provides many of the facilities that you need to assemble a JIT for various purposes. This talk walks you through construction of a simple JIT for C code (based on Clang) and @@ -90,7 +93,7 @@
[Slides] [Video]	Ted Kremenek Apple Inc.	Ted Kremenek Apple, Inc.	Finding Bugs with Source Code Analysis - .
Talin -	Google
Vikram Adve	University of Illinois at Urbana-Champaign
Nathan Allan	Alphora / Database Consulting Group
Owen Anderson	Apple
Owen Anderson	Apple, Inc.
Chris Aoki	Sun Microsystems, Inc.
Michael AuYeung	The Aerospace Corporation
Joseph Battelle	Logitech
Nate Begeman	Apple, Inc.
Kris Bell	Apple
Kris Bell	Apple, Inc.
Jay Bharadwaj	Intel Corporation
Robert Bowdidge	Self
Max Burke	Electronic Arts
Anders Carlsson	Apple Inc.
Anders Carlsson	Apple, Inc.
Chandler Carruth	Google, Inc
Evan Cheng	Apple
Evan Cheng	Apple, Inc.
Andy Chou	Coverity, Inc.
Eric Christopher	Apple, Inc
Jan Civlin	AMD
Stefanus Du Toit	RapidMind
Daniel Dunbar	Stanford University / Apple Inc.
Bernardo Elayda	Wind River
Ken Ferry	Apple
Ken Ferry	Apple, Inc.
Tim Foley	Self
Chandrashekhar Garud	Sun Microsystems
Nicolas Geoffray	Universit?? Pierre et Marie Curie
Dan Gohman	Apple
Dan Gohman	Apple, Inc.
John Golenbieski	Self
Eric Gouriou	Apple
Eric Gouriou	Apple, Inc.
Ryan Govostes	Alacatia Labs, Inc.
David Greene	Cray, Inc.
Jim Grosbach	Apple
Jim Grosbach	Apple, Inc.
Vinod Grover	NVIDIA
Alfonso Guerra	Apokalypse Software Corp.
Mohammad Reza Haghighat	Intel Corporation
Chris Hanson	Apple Inc.
Chris Hanson	Apple, Inc.
Kurt Harriman	Greenplum
Stuart Hastings	Apple
Stuart Hastings	Apple, Inc.
John Hixson	University of the Pacific
Robert Hundt	Google
Oliver Hunt	Apple, Inc.
Changhao Jiang	Facebook Inc.
dale johannesen	Apple
Francois Jouaux	Apple Inc.
dale johannesen	Apple, Inc.
Francois Jouaux	Apple, Inc.
Benjamin King	DemandEO.com
George King	arboreality.net
Nick Kledzik	Apple Inc
Nick Kledzik	Apple, Inc.
Anton Korobeynikov	Saint Petersburg State University
Ted Kremenek	Apple Inc.
Chris Lattner	Apple Inc
Tanya Lattner	Apple
Ted Kremenek	Apple, Inc.
Chris Lattner	Apple, Inc.
Tanya Lattner	Apple, Inc.
Andrew Lenharth	University of Illinois
Mark Leone	Self
Julien Lerouge	Apple, Inc.
olivier maggi	numeriz
Dmitri Makarov	AMD
Ali Mashtizadeh	VMware, Inc.
Henry Mason	Apple
Henry Mason	Apple, Inc.
Scott Michel	Aerospace
Keir Mierle	Google
Daniel Moniz	Unified Research
Marcel Moolenaar	The FreeBSD Project
Alireza Moshtaghi	Microchip Technology
Ginger Myles	Apple Inc.
Ginger Myles	Apple, Inc.
Prashanth Narayanaswamy	Sun Microsystems
Steve Naroff	Apple Inc.
Steve Naroff	Apple, Inc.
Ted Neward	Neward & Associates
Jay O'Conor	Self
Maksim Panchenko	Sun Microsystems
Ji Young Park	AMD Inc.
Terence Parr	University of San Francisco
Devang Patel	Apple
Devang Patel	Apple, Inc.
Scott Petersen	Adobe Systems, Inc.
Richard Phillips	Wolfram Research
Ernest Prabhakar	Apple
Ernest Prabhakar	Apple, Inc.
Gregor Purdy	Apple, Inc.
Paul Ramsey	Dreamworks Animation
Joseph Ranieri	Alacatia Labs, Inc.
Mitesh Shah	ARC International
Craig Smith	National Instruments
Evan Smyth	DreamWorks Animation
Pratik Solanki	Apple
Mike Stump	Apple
Pratik Solanki	Apple, Inc.
Mike Stump	Apple, Inc.
Andre Sublette	Self
Richard Sweet	Adobe Systems
Yan Tang	VMware
Caroline Tice	Apple Inc.
Caroline Tice	Apple, Inc.
Ross Towle	Sun
Andrew Trick	Hewlett-Packard
Hemant Trivedi	Silicon Informatics, Inc
Erick Tryzelaar	self
Mon Ping Wang	Apple
Mon Ping Wang	Apple, Inc.
Douglas Watt	XMOS Semiconductor
Patrick Webster	Self
Marcel Weiher	Apple
Sam Weinig	Apple Inc.
Marcel Weiher	Apple, Inc.
Sam Weinig	Apple, Inc.
Steve Weissinger	Wind River
Bill Wendling	Apple Inc.
Bill Wendling	Apple, Inc.
Hans-Martin Will	Vincent 3D Rendering Library (OSS project)
Pen-Chung Yew	University of Minnesota
Anna Zaks	New York University

Media	Who	Description
[Video Hi] - [Video Lo]
[Video Hi] + [Video Lo]	Chris Lattner Apple, Inc.
[Slides] - [Video Hi] - [Video Lo]	Nate Begeman Apple, Inc.	Building an Efficient JIT - LLVM provides many of the facilities that you need to assemble a JIT for various purposes. This talk walks @@ -300,7 +300,7 @@ src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"> - Last modified: $Date: 2008/08/04 06:28:53 $ + Last modified: $Date: 2008/08/04 06:32:28 $ From sabre at nondot.org Mon Aug 4 01:41:45 2008 From: sabre at nondot.org (Chris Lattner) Date: Mon, 4 Aug 2008 01:41:45 -0500 Subject: [llvm-commits] CVS: llvm-www/devmtg/2008-08/index.html Message-ID: <200808040641.m746firf015621@zion.cs.uiuc.edu> Changes in directory llvm-www/devmtg/2008-08: index.html updated: 1.14 -> 1.15 --- Log message: add nuno's talk video --- Diffs of the changes: (+4 -2) index.html \| 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Index: llvm-www/devmtg/2008-08/index.html diff -u llvm-www/devmtg/2008-08/index.html:1.14 llvm-www/devmtg/2008-08/index.html:1.15 --- llvm-www/devmtg/2008-08/index.html:1.14 Mon Aug 4 01:32:28 2008 +++ llvm-www/devmtg/2008-08/index.html Mon Aug 4 01:41:26 2008 @@ -98,7 +98,9 @@
[Slides] [Video]
[Slides] + [Video Hi] + [Video Lo]	Nuno Lopes Instituto Superior Tecnico	Building a JIT compiler for PHP in 2 days - This talk describes the implementation of the PHP interpreter and how it was easily changed into @@ -300,7 +302,7 @@ src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"> - Last modified: $Date: 2008/08/04 06:32:28 $ + Last modified: $Date: 2008/08/04 06:41:26 $ From bruno.cardoso at gmail.com Mon Aug 4 01:44:33 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Mon, 04 Aug 2008 06:44:33 -0000 Subject: [llvm-commits] [llvm] r54315 - in /llvm/trunk/lib/Target/Mips: MipsISelLowering.cpp MipsInstrFPU.td Message-ID: <200808040644.m746iXTA015705@zion.cs.uiuc.edu> Author: bruno Date: Mon Aug 4 01:44:31 2008 New Revision: 54315 URL: http://llvm.org/viewvc/llvm-project?rev=54315&view=rev Log: Handle i32->f32 bitconvert results. Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp llvm/trunk/lib/Target/Mips/MipsInstrFPU.td Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=54315&r1=54314&r2=54315&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Mon Aug 4 01:44:31 2008 @@ -138,7 +138,7 @@ setOperationAction(ISD::STACKRESTORE, MVT::Other, Expand); setOperationAction(ISD::MEMBARRIER, MVT::Other, Expand); - if (Subtarget->isSingleFloat()) + if (Subtarget->isSingleFloat()) setOperationAction(ISD::SELECT_CC, MVT::f64, Expand); if (!Subtarget->hasSEInReg()) { Modified: llvm/trunk/lib/Target/Mips/MipsInstrFPU.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrFPU.td?rev=54315&r1=54314&r2=54315&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsInstrFPU.td (original) +++ llvm/trunk/lib/Target/Mips/MipsInstrFPU.td Mon Aug 4 01:44:31 2008 @@ -339,3 +339,8 @@ def : Pat<(i32 (bitconvert FGR32:$src)), (MFC1 FGR32:$src)>; def : Pat<(i32 (bitconvert AFGR32:$src)), (MFC1A AFGR32:$src)>; + +def : Pat<(f32 (bitconvert CPURegs:$src)), (MTC1 CPURegs:$src)>, + Requires<[IsSingleFloat]>; +def : Pat<(f32 (bitconvert CPURegs:$src)), (MTC1A CPURegs:$src)>, + Requires<[In32BitMode]>; From bruno.cardoso at gmail.com Mon Aug 4 02:12:53 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Mon, 04 Aug 2008 07:12:53 -0000 Subject: [llvm-commits] [llvm] r54316 - in /llvm/trunk/lib/Target/Mips: MipsISelLowering.cpp MipsISelLowering.h Message-ID: <200808040712.m747Crgd016513@zion.cs.uiuc.edu> Author: bruno Date: Mon Aug 4 02:12:52 2008 New Revision: 54316 URL: http://llvm.org/viewvc/llvm-project?rev=54316&view=rev Log: Mips ISelLowering cleanup : Removed old LowerCALL and FORMAL_ARGS helpers, they aren't used anyway, they also used to broke compiling when fastcc was specified for a function, but not anymore. Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp llvm/trunk/lib/Target/Mips/MipsISelLowering.h Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=54316&r1=54315&r2=54316&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Mon Aug 4 02:12:52 2008 @@ -556,34 +556,19 @@ // CALL Calling Convention Implementation //===----------------------------------------------------------------------===// -/// Mips custom CALL implementation -SDValue MipsTargetLowering:: -LowerCALL(SDValue Op, SelectionDAG &DAG) -{ - unsigned CallingConv = cast(Op.getOperand(1))->getValue(); - - // By now, only CallingConv::C implemented - switch (CallingConv) { - default: - assert(0 && "Unsupported calling convention"); - case CallingConv::Fast: - case CallingConv::C: - return LowerCCCCallTo(Op, DAG, CallingConv); - } -} - /// LowerCCCCallTo - functions arguments are copied from virtual /// regs to (physical regs)/(stack frame), CALLSEQ_START and /// CALLSEQ_END are emitted. /// TODO: isVarArg, isTailCall. SDValue MipsTargetLowering:: -LowerCCCCallTo(SDValue Op, SelectionDAG &DAG, unsigned CC) +LowerCALL(SDValue Op, SelectionDAG &DAG) { MachineFunction &MF = DAG.getMachineFunction(); - SDValue Chain = Op.getOperand(0); + SDValue Chain = Op.getOperand(0); SDValue Callee = Op.getOperand(4); - bool isVarArg = cast(Op.getOperand(2))->getValue() != 0; + bool isVarArg = cast(Op.getOperand(2))->getValue() != 0; + unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv(); MachineFrameInfo MFI = MF.getFrameInfo(); @@ -786,34 +771,20 @@ // FORMAL_ARGUMENTS Calling Convention Implementation //===----------------------------------------------------------------------===// -/// Mips custom FORMAL_ARGUMENTS implementation -SDValue MipsTargetLowering:: -LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG) -{ - unsigned CC = cast(Op.getOperand(1))->getValue(); - switch(CC) - { - default: - assert(0 && "Unsupported calling convention"); - case CallingConv::C: - return LowerCCCArguments(Op, DAG); - } -} - -/// LowerCCCArguments - transform physical registers into +/// LowerFORMAL_ARGUMENTS - transform physical registers into /// virtual registers and generate load operations for /// arguments places on the stack. /// TODO: isVarArg SDValue MipsTargetLowering:: -LowerCCCArguments(SDValue Op, SelectionDAG &DAG) +LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG) { - SDValue Root = Op.getOperand(0); - MachineFunction &MF = DAG.getMachineFunction(); + SDValue Root = Op.getOperand(0); + MachineFunction &MF = DAG.getMachineFunction(); MachineFrameInfo MFI = MF.getFrameInfo(); MipsFunctionInfo MipsFI = MF.getInfo(); bool isVarArg = cast(Op.getOperand(2))->getValue() != 0; - unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv(); + unsigned CC = DAG.getMachineFunction().getFunction()->getCallingConv(); unsigned StackReg = MF.getTarget().getRegisterInfo()->getFrameRegister(MF); Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.h?rev=54316&r1=54315&r2=54316&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsISelLowering.h (original) +++ llvm/trunk/lib/Target/Mips/MipsISelLowering.h Mon Aug 4 02:12:52 2008 @@ -83,8 +83,6 @@ const MipsSubtarget Subtarget; // Lower Operand helpers - SDValue LowerCCCArguments(SDValue Op, SelectionDAG &DAG); - SDValue LowerCCCCallTo(SDValue Op, SelectionDAG &DAG, unsigned CC); SDNode LowerCallResult(SDValue Chain, SDValue InFlag, SDNodeTheCall, unsigned CallingConv, SelectionDAG &DAG); bool IsGlobalInSmallSection(GlobalValue GV); From baldrick at free.fr Mon Aug 4 02:24:30 2008 From: baldrick at free.fr (Duncan Sands) Date: Mon, 4 Aug 2008 09:24:30 +0200 Subject: [llvm-commits] SoftenFloatOp support for fp_round In-Reply-To: <275e64e40808032317r1b1fd3c2mcc70584e5a8aa10c@mail.gmail.com> References: <275e64e40807161139x699f650cx816bf9947e5b0ae9@mail.gmail.com> <200807162143.44860.baldrick@free.fr> <275e64e40808032317r1b1fd3c2mcc70584e5a8aa10c@mail.gmail.com> Message-ID: <200808040924.31674.baldrick@free.fr> Hi Bruno, +SDValue DAGTypeLegalizer::SoftenFloatRes_FABS(SDNode N) { + MVT VT = N->getValueType(0); + assert((VT == MVT::f64 \|\| VT == MVT::f32) && + "Don't know how to soften other FABS result types"); it is easy to support any width, so best to do so (see below). + + MVT NVT = TLI.getTypeToTransformTo(VT); + SDValue Lo = GetSoftenedFloat(N->getOperand(0)); + SDValue Mask = (VT == MVT::f64) + ? DAG.getConstantFP(BitsToDouble(~(1ULL << 63)), VT) + : DAG.getConstantFP(BitsToFloat(~(1U << 31)), VT); + Mask = DAG.getNode(ISD::BIT_CONVERT, NVT, Mask); What you are doing here is bitcasting 1 << 63 to a double, then bitcasting that double back again to an integer. Why don't you directly generate the integer? That way it also works for any floating point type. What you need to do is create an APInt with bitwidth NVT->getSizeInBits(), and use some APInt method to set the top bit. Then Mask is simply DAG.getConstant(MyAPInt, NVT). + return DAG.getNode(ISD::AND, NVT, Lo, Mask); +} +SDValue DAGTypeLegalizer::SoftenFloatOp_FP_ROUND(SDNode *N) { + MVT SVT = N->getOperand(0).getValueType(); + MVT RVT = TLI.getTypeToTransformTo(N->getValueType(0)); This should be: MVT RVT = N->getValueType(0); This type is necessarily legal (because LegalizeTypes always legalizes return types before operands; the result is that if you are in operand legalization then you can be sure that the return types are all legal). So TLI.getTypeToTransformTo is a no-op. + RTLIB::Libcall LC = RTLIB::getFPROUND(SVT, RVT); + assert(LC != RTLIB::UNKNOWN_LIBCALL && "Unsupported FP_ROUND libcall"); + + SDValue Op = GetSoftenedFloat(N->getOperand(0)); + return MakeLibCall(LC, RVT, &Op, 1, false); +} Otherwise it's ok. Thanks! Duncan. From criswell at cs.uiuc.edu Mon Aug 4 11:11:06 2008 From: criswell at cs.uiuc.edu (John Criswell) Date: Mon, 4 Aug 2008 11:11:06 -0500 Subject: [llvm-commits] CVS: llvm-www/devmtg/2008-08/index.html Message-ID: <200808041611.m74GB6Fp032652@maute.cs.uiuc.edu> Changes in directory llvm-www/devmtg/2008-08: index.html updated: 1.15 -> 1.16 --- Log message: Adhere to the UIUC web standards which require us to use University of Illinois instead of UIUC. --- Diffs of the changes: (+2 -2) index.html \| 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) Index: llvm-www/devmtg/2008-08/index.html diff -u llvm-www/devmtg/2008-08/index.html:1.15 llvm-www/devmtg/2008-08/index.html:1.16 --- llvm-www/devmtg/2008-08/index.html:1.15 Mon Aug 4 01:41:26 2008 +++ llvm-www/devmtg/2008-08/index.html Mon Aug 4 11:10:12 2008 @@ -18,7 +18,7 @@

Media	Who	Description
[Video Hi] - [Video Lo]
+ [Video Hi] + [Video Lo] +	Chris Lattner Apple, Inc.	Welcome and Thanks - A brief welcome, thanks and some logistics for the day.
[Slides] - [Video Hi] - [Video Lo]
+ [Slides] + [Video Hi] + [Video Lo] +	Steve Naroff Apple, Inc.	Clang Internals - Clang status, design and architecture.
[Slides] [Video]
+ [Slides] + [Video Hi] + [Video Lo] +	Evan Cheng Apple, Inc.	LLVM Register Allocation - Description of the current design and architecture of the LLVM register allocator. The talk discusses some @@ -91,7 +99,12 @@
[Slides] [Video]
+ [Slides] + [Video Hi] + [Video Lo] +	Chuck Rose III Adobe Inc.	Adobe Image Foundation and Adobe PixelBender - Adobe Image Foundation is a system for JIT compiling code written in the Adobe @@ -150,7 +163,11 @@
[Slides] [No video]
+ [Slides] + [No video] +	John Criswell University of Illinois	SVA: Using LLVM to Provide Memory Safety - .
Media	Who	Description
+	[Video Hi] [Video Lo]
+	[Slides] [Video Hi] [Video Lo] @@ -57,7 +57,7 @@
+	[Slides] [Video Hi] [Video Lo] @@ -70,7 +70,7 @@
+	[Slides] [Video Hi] [Video Lo] @@ -84,7 +84,8 @@
[Slides] +	+ [Slides] [Video Hi] [Video Lo]
+	[Slides] [Video Hi] [Video Lo] @@ -116,7 +117,7 @@
+	[Slides] [Video Hi] [Video Lo] @@ -134,7 +135,7 @@
+	[Slides] [Video Hi] [Video Lo] @@ -148,7 +149,7 @@
+	[Slides] [Video Hi] [Video Lo] @@ -164,7 +165,7 @@
+	[Slides] [No video]
+	[Slides] [Video Hi] [Video Lo] @@ -189,7 +190,7 @@
+	[Slides] [Video Hi] [Video Lo] @@ -205,7 +206,7 @@
+	[Slides] [Video Hi] [Video Lo] @@ -362,7 +363,7 @@ src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"> - Last modified: $Date: 2008/08/05 15:42:43 $ + Last modified: $Date: 2008/08/05 15:44:41 $ From gohman at apple.com Tue Aug 5 10:51:47 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 05 Aug 2008 15:51:47 -0000 Subject: [llvm-commits] [llvm] r54351 - in /llvm/trunk: lib/VMCore/AsmWriter.cpp lib/VMCore/ParameterAttributes.cpp lib/VMCore/Verifier.cpp test/Assembler/2006-05-26-VarargsCallEncode.ll Message-ID: <200808051551.m75FpmQA013519@zion.cs.uiuc.edu> Author: djg Date: Tue Aug 5 10:51:44 2008 New Revision: 54351 URL: http://llvm.org/viewvc/llvm-project?rev=54351&view=rev Log: Fix the AsmWriter to not print extra spaces after parameter attributes. Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp llvm/trunk/lib/VMCore/ParameterAttributes.cpp llvm/trunk/lib/VMCore/Verifier.cpp llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll Modified: llvm/trunk/lib/VMCore/AsmWriter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/AsmWriter.cpp?rev=54351&r1=54350&r2=54351&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/AsmWriter.cpp (original) +++ llvm/trunk/lib/VMCore/AsmWriter.cpp Tue Aug 5 10:51:44 2008 @@ -1385,7 +1385,7 @@ Out << " )"; if (PAL.getParamAttrs(0) != ParamAttr::None) - Out << " " << ParamAttr::getAsString(PAL.getParamAttrs(0)); + Out << ' ' << ParamAttr::getAsString(PAL.getParamAttrs(0)); Out << "\n\t\t\tto"; writeOperand(II->getNormalDest(), true); Out << " unwind"; Modified: llvm/trunk/lib/VMCore/ParameterAttributes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/ParameterAttributes.cpp?rev=54351&r1=54350&r2=54351&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/ParameterAttributes.cpp (original) +++ llvm/trunk/lib/VMCore/ParameterAttributes.cpp Tue Aug 5 10:51:44 2008 @@ -52,6 +52,8 @@ Result += utostr((Attrs & ParamAttr::Alignment) >> 16); Result += " "; } + // Trim the trailing space. + Result.erase(Result.end()-1); return Result; } Modified: llvm/trunk/lib/VMCore/Verifier.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Verifier.cpp?rev=54351&r1=54350&r2=54351&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Verifier.cpp (original) +++ llvm/trunk/lib/VMCore/Verifier.cpp Tue Aug 5 10:51:44 2008 @@ -404,18 +404,18 @@ if (isReturnValue) { ParameterAttributes RetI = Attrs & ParamAttr::ParameterOnly; Assert1(!RetI, "Attribute " + ParamAttr::getAsString(RetI) + - "does not apply to return values!", V); + " does not apply to return values!", V); } else { ParameterAttributes ParmI = Attrs & ParamAttr::ReturnOnly; Assert1(!ParmI, "Attribute " + ParamAttr::getAsString(ParmI) + - "only applies to return values!", V); + " only applies to return values!", V); } for (unsigned i = 0; i < array_lengthof(ParamAttr::MutuallyIncompatible); ++i) { ParameterAttributes MutI = Attrs & ParamAttr::MutuallyIncompatible[i]; Assert1(!(MutI & (MutI - 1)), "Attributes " + - ParamAttr::getAsString(MutI) + "are incompatible!", V); + ParamAttr::getAsString(MutI) + " are incompatible!", V); } ParameterAttributes TypeI = Attrs & ParamAttr::typeIncompatible(Ty); @@ -931,7 +931,7 @@ ParameterAttributes VArgI = Attr & ParamAttr::VarArgsIncompatible; Assert1(!VArgI, "Attribute " + ParamAttr::getAsString(VArgI) + - "cannot be used for vararg call arguments!", I); + " cannot be used for vararg call arguments!", I); } visitInstruction(I); Modified: llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll?rev=54351&r1=54350&r2=54351&view=diff ============================================================================== --- llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll (original) +++ llvm/trunk/test/Assembler/2006-05-26-VarargsCallEncode.ll Tue Aug 5 10:51:44 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| llvm-dis \| grep {tail call void.sret null} +; RUN: llvm-as < %s \| llvm-dis \| grep {tail call void.sret null} declare void @foo({ } sret , ...) From clattner at apple.com Tue Aug 5 11:29:52 2008 From: clattner at apple.com (Chris Lattner) Date: Tue, 5 Aug 2008 09:29:52 -0700 Subject: [llvm-commits] [llvm] r54248 - in /llvm/trunk: include/llvm/Target/TargetOptions.h lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp lib/Target/PowerPC/PPCISelLowering.cpp lib/Target/PowerPC/PPCTargetMachine.cpp lib/Target/TargetMachine.cpp In-Reply-To: References: <200807311813.m6VIDDrq000839@zion.cs.uiuc.edu> <0A042EDE-0156-4F24-92C9-6B2DDD4787AD@apple.com> Message-ID: <61A0696E-66B2-4CA5-9CDE-F5BE345FF9AF@apple.com> On Aug 5, 2008, at 12:19 AM, Evan Cheng wrote: >> TargetOptions is for things that clients of the code generator set >> when they want to affect the behavior of codegen. >> >> In this case, jump tables are never valid in ppc64 JIT mode. Why not >> just have the PPC backend mark BR_JT and BRIND as illegal when in 64- >> bit jit mode? That way no target-indep code changes. > > The issue is PPCTargetLowering doesn't know it's in JIT mode. > PPCTargetMachine::addCodeEmitter would have to toggle something to let > it know. It's not exactly clean either. > > This is a short term workaround. I suspect teaching PPCJITInfo about > PIC jumptable is pretty trivial. Once that's done, this whole thing > can be reverted. Are you guys planning to implement it? If not, this will live on for a very long time. I'd strongly prefer teaching PPCTargetLowering that it is in JIT mode. -Chris From clattner at apple.com Tue Aug 5 11:31:54 2008 From: clattner at apple.com (Chris Lattner) Date: Tue, 5 Aug 2008 09:31:54 -0700 Subject: [llvm-commits] [llvm] r54334 - in /llvm/trunk/test/CodeGen: ARM/2007-08-15-ReuseBug.ll ARM/remat.ll X86/2007-07-25-EpilogueBug.ll X86/2007-11-14-Coalescer-Bug.ll X86/2007-11-30-LoadFolding-Bug.ll X86/2007-11-30-TestLoadFolding.ll X86/2008-04-17-CoalescerBug.ll X86/2008-05-06-SpillerBug.ll X86/2008-05-21-CoalescerBug.ll X86/2008-06-13-SpillerCommuting.ll X86/ins_subreg_coalesce-3.ll In-Reply-To: <3BAE6DC5-F79A-4E79-9412-6C122152A641@apple.com> References: <200808042355.m74NtUQ8000644@zion.cs.uiuc.edu> <33F024A1-126D-4B5A-ADAC-02126683C5C8@apple.com> <3BAE6DC5-F79A-4E79-9412-6C122152A641@apple.com> Message-ID: <81E6A2A0-2A28-423E-8D37-B46ADAB42C87@apple.com> On Aug 5, 2008, at 12:27 AM, Evan Cheng wrote: > I believe there are 11 test cases that cannot be trivially fixed. I am > not sure how easy it is to go back and re-reduce these tests? That can > take a lot of time. Which tests? What are they doing? Why not just add non-dead edges (e.g. new bool arguments to the function or load of a bool for branch conditions) in the CFG to prevent the blocks from being deleted? > It's likely some of the tests will require more effort to fix up / > regen than it's worth. If you are totally against the option, we can > simply remove those tests that are now invalid. Fixing 11 tests is cheaper than carrying around a dead option forever. Why is updating the tests hard? I'm not suggesting you find the original source of the test and update them, just tweak the test to test the right thing. -Chris From sabre at nondot.org Tue Aug 5 12:04:28 2008 From: sabre at nondot.org (Chris Lattner) Date: Tue, 5 Aug 2008 12:04:28 -0500 Subject: [llvm-commits] CVS: llvm-www/devmtg/2008-08/Begeman_EfficientJIT.pdf index.html Message-ID: <200808051704.m75H4SqS016268@zion.cs.uiuc.edu> Changes in directory llvm-www/devmtg/2008-08: Begeman_EfficientJIT.pdf added (r1.1) index.html updated: 1.23 -> 1.24 --- Log message: Add Nait's slides. --- Diffs of the changes: (+2 -2) Begeman_EfficientJIT.pdf \| 0 index.html \| 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) Index: llvm-www/devmtg/2008-08/Begeman_EfficientJIT.pdf Index: llvm-www/devmtg/2008-08/index.html diff -u llvm-www/devmtg/2008-08/index.html:1.23 llvm-www/devmtg/2008-08/index.html:1.24 --- llvm-www/devmtg/2008-08/index.html:1.23 Tue Aug 5 10:44:41 2008 +++ llvm-www/devmtg/2008-08/index.html Tue Aug 5 11:55:42 2008 @@ -85,7 +85,7 @@
- [Slides] + [Slides] [Video Hi] [Video Lo]	John Criswell University of Illinois	SVA: Using LLVM to Provide Memory Safety - . +	SVA: Using LLVM to Provide Memory Safety - SVA is an aggressive approach to + provide an efficient compiler-based system with memory safety on top + of the LLVM IR. Unfortunately, video is not available due to + camera problems.
Steve Naroff Apple, Inc.	Clang Internals - Clang status, design and architecture. +	+ Clang Internals - Clang is + is a new C/ObjC/C++ front-end in development as part of the LLVM project. + This talk describes its current status, high level architecture, and how + its Abstract Syntax Trees (ASTs) work.
[Slides] - [Video Hi] - [Video Lo] + [Video Hi] + [Video Lo]	Evan Cheng Apple, Inc.	LLVM Register Allocation - Description of the current design and @@ -371,7 +371,7 @@ src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"> - Last modified: $Date: 2008/08/05 17:09:34 $ + Last modified: $Date: 2008/08/05 17:13:10 $ From evan.cheng at apple.com Tue Aug 5 12:43:20 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 5 Aug 2008 10:43:20 -0700 Subject: [llvm-commits] [llvm] r54248 - in /llvm/trunk: include/llvm/Target/TargetOptions.h lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp lib/Target/PowerPC/PPCISelLowering.cpp lib/Target/PowerPC/PPCTargetMachine.cpp lib/Target/TargetMachine.cpp In-Reply-To: <61A0696E-66B2-4CA5-9CDE-F5BE345FF9AF@apple.com> References: <200807311813.m6VIDDrq000839@zion.cs.uiuc.edu> <0A042EDE-0156-4F24-92C9-6B2DDD4787AD@apple.com> <61A0696E-66B2-4CA5-9CDE-F5BE345FF9AF@apple.com> Message-ID: <72AA15A6-0348-4AB2-9A67-B8001345605B@apple.com> That's the plan. But Dale is on something more critical right now. Implementing it should be extremely simple, it just require some testing. This is what X86 do: /// getPICJumpTableEntry - Returns the value of the jumptable entry for the /// specific basic block. intptr_t X86JITInfo::getPICJumpTableEntry(intptr_t BB, intptr_t Entry) { #if defined(X86_64_JIT) return BB - Entry; #else return BB - PICBase; #endif } Evan On Aug 5, 2008, at 9:29 AM, Chris Lattner wrote: > > On Aug 5, 2008, at 12:19 AM, Evan Cheng wrote: > >>> TargetOptions is for things that clients of the code generator set >>> when they want to affect the behavior of codegen. >>> >>> In this case, jump tables are never valid in ppc64 JIT mode. Why >>> not >>> just have the PPC backend mark BR_JT and BRIND as illegal when in >>> 64- >>> bit jit mode? That way no target-indep code changes. >> >> The issue is PPCTargetLowering doesn't know it's in JIT mode. >> PPCTargetMachine::addCodeEmitter would have to toggle something to >> let >> it know. It's not exactly clean either. >> >> This is a short term workaround. I suspect teaching PPCJITInfo about >> PIC jumptable is pretty trivial. Once that's done, this whole thing >> can be reverted. > > Are you guys planning to implement it? If not, this will live on for > a very long time. I'd strongly prefer teaching PPCTargetLowering that > it is in JIT mode. > > -Chris > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From resistor at mac.com Tue Aug 5 12:50:51 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 17:50:51 -0000 Subject: [llvm-commits] [llvm] r54354 - /llvm/trunk/test/CodeGen/ARM/remat.ll Message-ID: <200808051751.m75Hp3Yu017865@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 12:49:52 2008 New Revision: 54354 URL: http://llvm.org/viewvc/llvm-project?rev=54354&view=rev Log: Remove the need for -disable-correct-folding from this test. Modified: llvm/trunk/test/CodeGen/ARM/remat.ll Modified: llvm/trunk/test/CodeGen/ARM/remat.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/remat.ll?rev=54354&r1=54353&r2=54354&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/ARM/remat.ll (original) +++ llvm/trunk/test/CodeGen/ARM/remat.ll Tue Aug 5 12:49:52 2008 @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s \| llc -mtriple=arm-apple-darwin -; RUN: llvm-as < %s \| llc -mtriple=arm-apple-darwin -disable-correct-folding -stats -info-output-file - \| grep "Number of re-materialization" \| grep 3 +; RUN: llvm-as < %s \| llc -mtriple=arm-apple-darwin -stats -info-output-file - \| grep "Number of re-materialization" \| grep 3 %struct.CONTENTBOX = type { i32, i32, i32, i32, i32 } %struct.LOCBOX = type { i32, i32, i32, i32 } @@ -20,20 +20,21 @@ br label %bb490 bb8: ; preds = %bb490, %cond_false428 - br i1 false, label %cond_false58.i, label %cond_false.i + %foo3 = phi i1 [ 0, %bb490 ], [ 1, %cond_false428 ] + br i1 %foo3, label %cond_false58.i, label %cond_false.i cond_false.i: ; preds = %bb8 ret void cond_false58.i: ; preds = %bb8 %highBinX.0.i = select i1 false, i32 1, i32 0 ; [#uses=2] - br i1 false, label %cond_next85.i, label %cond_false76.i + br i1 %foo3, label %cond_next85.i, label %cond_false76.i cond_false76.i: ; preds = %cond_false58.i ret void cond_next85.i: ; preds = %cond_false58.i - br i1 false, label %cond_next105.i, label %cond_false98.i + br i1 %foo3, label %cond_next105.i, label %cond_false98.i cond_false98.i: ; preds = %cond_next85.i ret void @@ -43,7 +44,7 @@ %tmp115.i = icmp eq i32 1, %tmp77.i ; [#uses=1] %bothcond.i = and i1 %tmp115.i, %tmp108.i ; [#uses=1] %storemerge.i = select i1 %bothcond.i, i32 1, i32 0 ; [#uses=2] - br i1 false, label %whoOverlaps.exit, label %bb503.preheader.i + br i1 %bothcond.i, label %whoOverlaps.exit, label %bb503.preheader.i bb503.preheader.i: ; preds = %bb513.i, %cond_next105.i %i.022.0.i = phi i32 [ %tmp512.i, %bb513.i ], [ 0, %cond_next105.i ] ; [#uses=2] @@ -51,7 +52,7 @@ br label %bb503.i bb137.i: ; preds = %bb503.i - br i1 false, label %bb162.i, label %bb148.i + br i1 %tmp506.i, label %bb162.i, label %bb148.i bb148.i: ; preds = %bb137.i ret void @@ -100,15 +101,17 @@ br i1 %tmp516.i, label %whoOverlaps.exit, label %bb503.preheader.i whoOverlaps.exit: ; preds = %bb513.i, %cond_next105.i - br i1 false, label %cond_false428, label %bb490 + %foo = phi i1 [ 1, %bb513.i], [0, %cond_next105.i] + br i1 %foo, label %cond_false428, label %bb490 cond_false428: ; preds = %whoOverlaps.exit - br i1 false, label %bb497, label %bb8 + br i1 %foo, label %bb497, label %bb8 bb490: ; preds = %whoOverlaps.exit, %entry %binY.tmp.2 = phi i32 [ 0, %entry ], [ %storemerge.i, %whoOverlaps.exit ] ; [#uses=1] %cell.1 = phi i32 [ 1, %entry ], [ 0, %whoOverlaps.exit ] ; [#uses=1] - br i1 false, label %bb497, label %bb8 + %foo2 = phi i1 [ 1, %entry], [0, %whoOverlaps.exit] + br i1 %foo2, label %bb497, label %bb8 bb497: ; preds = %bb490, %cond_false428 %binY.tmp.3 = phi i32 [ %binY.tmp.2, %bb490 ], [ %storemerge.i, %cond_false428 ] ; [#uses=0] From resistor at mac.com Tue Aug 5 12:53:07 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 17:53:07 -0000 Subject: [llvm-commits] [llvm] r54355 - /llvm/trunk/test/CodeGen/ARM/2007-08-15-ReuseBug.ll Message-ID: <200808051753.m75Hr9P3017962@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 12:52:54 2008 New Revision: 54355 URL: http://llvm.org/viewvc/llvm-project?rev=54355&view=rev Log: This check is unnecessary, and getting rid of it removes a use of -disable-correct-folding. Modified: llvm/trunk/test/CodeGen/ARM/2007-08-15-ReuseBug.ll Modified: llvm/trunk/test/CodeGen/ARM/2007-08-15-ReuseBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2007-08-15-ReuseBug.ll?rev=54355&r1=54354&r2=54355&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/ARM/2007-08-15-ReuseBug.ll (original) +++ llvm/trunk/test/CodeGen/ARM/2007-08-15-ReuseBug.ll Tue Aug 5 12:52:54 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| llc -mtriple=arm-apple-darwin -relocation-model=pic -mattr=+v6 -disable-correct-folding \| %prcontext {ldr.\\!} 1 \| grep mov +; RUN: llvm-as < %s \| llc -mtriple=arm-apple-darwin -relocation-model=pic -mattr=+v6 ; PR1609 %struct.FILE = type { i8, i32, i32, i16, i16, %struct.__sbuf, i32, i8, i32 (i8), i32 (i8, i8, i32), i64 (i8, i64, i32), i32 (i8, i8, i32), %struct.__sbuf, %struct.__sFILEX, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 } From evan.cheng at apple.com Tue Aug 5 12:53:14 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 5 Aug 2008 10:53:14 -0700 Subject: [llvm-commits] [llvm] r54334 - in /llvm/trunk/test/CodeGen: ARM/2007-08-15-ReuseBug.ll ARM/remat.ll X86/2007-07-25-EpilogueBug.ll X86/2007-11-14-Coalescer-Bug.ll X86/2007-11-30-LoadFolding-Bug.ll X86/2007-11-30-TestLoadFolding.ll X86/2008-04-17-CoalescerBug.ll X86/2008-05-06-SpillerBug.ll X86/2008-05-21-CoalescerBug.ll X86/2008-06-13-SpillerCommuting.ll X86/ins_subreg_coalesce-3.ll In-Reply-To: <81E6A2A0-2A28-423E-8D37-B46ADAB42C87@apple.com> References: <200808042355.m74NtUQ8000644@zion.cs.uiuc.edu> <33F024A1-126D-4B5A-ADAC-02126683C5C8@apple.com> <3BAE6DC5-F79A-4E79-9412-6C122152A641@apple.com> <81E6A2A0-2A28-423E-8D37-B46ADAB42C87@apple.com> Message-ID: <79858346-2671-4355-997F-E9324B9FCF4A@apple.com> On Aug 5, 2008, at 9:31 AM, Chris Lattner wrote: > > On Aug 5, 2008, at 12:27 AM, Evan Cheng wrote: > >> I believe there are 11 test cases that cannot be trivially fixed. I >> am >> not sure how easy it is to go back and re-reduce these tests? That >> can >> take a lot of time. > > Which tests? What are they doing? Why not just add non-dead edges > (e.g. new bool arguments to the function or load of a bool for branch > conditions) in the CFG to prevent the blocks from being deleted? You do realize that's not always possible? Any tests that are dependent on behavior of register allocator / spiller / coalescer are very fragile as it is. > > >> It's likely some of the tests will require more effort to fix up / >> regen than it's worth. If you are totally against the option, we can >> simply remove those tests that are now invalid. > > Fixing 11 tests is cheaper than carrying around a dead option > forever. Why is updating the tests hard? I'm not suggesting you > find the original source of the test and update them, just tweak the > test to test the right thing. That's fine. Just realize some tests will not end up testing the same thing and some may end up being removed. Evan > > > -Chris > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From resistor at mac.com Tue Aug 5 13:03:49 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 18:03:49 -0000 Subject: [llvm-commits] [llvm] r54356 - /llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll Message-ID: <200808051803.m75I3uhu018282@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 13:03:01 2008 New Revision: 54356 URL: http://llvm.org/viewvc/llvm-project?rev=54356&view=rev Log: Eliminate another use of -disable-correct-folding. Modified: llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll Modified: llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll?rev=54356&r1=54355&r2=54356&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll (original) +++ llvm/trunk/test/CodeGen/X86/2007-11-30-LoadFolding-Bug.ll Tue Aug 5 13:03:01 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| llc -march=x86 -mattr=+sse2 -disable-correct-folding -stats \|& \ +; RUN: llvm-as < %s \| llc -march=x86 -mattr=+sse2 -stats \|& \ ; RUN: grep {1 .folded into instructions} declare fastcc void @rdft(i32, i32, double, i32, double) @@ -9,25 +9,26 @@ bb.i5: ; preds = %bb.i5, %entry %nfft_init.0.i = phi i32 [ 1, %entry ], [ %tmp7.i3, %bb.i5 ] ; [#uses=1] + %foo = phi i1 [1, %entry], [0, %bb.i5] %tmp7.i3 = shl i32 %nfft_init.0.i, 1 ; [#uses=2] - br i1 false, label %bb.i5, label %mp_unexp_mp2d.exit.i + br i1 %foo, label %bb.i5, label %mp_unexp_mp2d.exit.i mp_unexp_mp2d.exit.i: ; preds = %bb.i5 - br i1 false, label %cond_next.i, label %cond_true.i + br i1 %foo, label %cond_next.i, label %cond_true.i cond_true.i: ; preds = %mp_unexp_mp2d.exit.i ret void cond_next.i: ; preds = %mp_unexp_mp2d.exit.i %tmp22.i = sdiv i32 0, 2 ; [#uses=2] - br i1 false, label %cond_true29.i, label %cond_next36.i + br i1 %foo, label %cond_true29.i, label %cond_next36.i cond_true29.i: ; preds = %cond_next.i ret void cond_next36.i: ; preds = %cond_next.i store i32 %tmp22.i, i32* null, align 4 - %tmp8.i14.i = select i1 false, i32 1, i32 0 ; [#uses=1] + %tmp8.i14.i = select i1 %foo, i32 1, i32 0 ; [#uses=1] br label %bb.i28.i bb.i28.i: ; preds = %bb.i28.i, %cond_next36.i @@ -47,7 +48,7 @@ mp_unexp_d2mp.exit29.i: ; preds = %bb.i28.i %tmp46.i = sub i32 0, %tmp22.i ; [#uses=1] store i32 %tmp46.i, i32* null, align 4 - br i1 false, label %bb.i.i, label %mp_sqrt_init.exit + br i1 %exitcond40.i, label %bb.i.i, label %mp_sqrt_init.exit bb.i.i: ; preds = %bb.i.i, %mp_unexp_d2mp.exit29.i br label %bb.i.i @@ -56,7 +57,7 @@ tail call fastcc void @mp_mul_csqu( i32 0, double* %tmp1fft ) tail call fastcc void @rdft( i32 0, i32 -1, double* null, i32* %ip, double* %w ) tail call fastcc void @mp_mul_d2i( i32 0, i32 %radix, i32 0, double* %tmp1fft, i32* %tmp2 ) - br i1 false, label %cond_false.i, label %cond_true36.i + br i1 %exitcond40.i, label %cond_false.i, label %cond_true36.i cond_true36.i: ; preds = %mp_sqrt_init.exit ret void From resistor at mac.com Tue Aug 5 13:06:11 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 18:06:11 -0000 Subject: [llvm-commits] [llvm] r54357 - /llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll Message-ID: <200808051806.m75I6FZV018356@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 13:05:58 2008 New Revision: 54357 URL: http://llvm.org/viewvc/llvm-project?rev=54357&view=rev Log: Remove another -disable-correct-folding use. Modified: llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll Modified: llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll?rev=54357&r1=54356&r2=54357&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll (original) +++ llvm/trunk/test/CodeGen/X86/2007-11-30-TestLoadFolding.ll Tue Aug 5 13:05:58 2008 @@ -1,6 +1,6 @@ -; RUN: llvm-as < %s \| llc -march=x86 -disable-correct-folding -stats \|& \ +; RUN: llvm-as < %s \| llc -march=x86 -stats \|& \ ; RUN: grep {1 .folded into instructions} -; RUN: llvm-as < %s \| llc -march=x86 -disable-correct-folding \| grep cmp \| count 3 +; RUN: llvm-as < %s \| llc -march=x86 \| grep cmp \| count 4 %struct.quad_struct = type { i32, i32, %struct.quad_struct, %struct.quad_struct, %struct.quad_struct, %struct.quad_struct, %struct.quad_struct } @@ -31,7 +31,7 @@ %tmp19.i12.i171 = load %struct.quad_struct** %tmp18.i11.i170, align 4 ; <%struct.quad_struct> [#uses=1] %tmp21.i173 = tail call fastcc i32 @sum_adjacent( %struct.quad_struct %tmp19.i12.i171, i32 3, i32 2, i32 %tmp7.i162 ) ; [#uses=1] %tmp22.i174 = add i32 %tmp21.i173, %tmp13.i168 ; [#uses=1] - br i1 false, label %cond_true.i141, label %cond_false.i156 + br i1 %tmp4.i161, label %cond_true.i141, label %cond_false.i156 cond_false.i178: ; preds = %cond_true.i35 ret i32 0 From resistor at mac.com Tue Aug 5 13:09:37 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 18:09:37 -0000 Subject: [llvm-commits] [llvm] r54358 - /llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll Message-ID: <200808051810.m75IA11r018487@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 13:08:56 2008 New Revision: 54358 URL: http://llvm.org/viewvc/llvm-project?rev=54358&view=rev Log: One more -disable-correct-folding case removed. Modified: llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll Modified: llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll?rev=54358&r1=54357&r2=54358&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll (original) +++ llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll Tue Aug 5 13:08:56 2008 @@ -13,21 +13,21 @@ @.str33 = external constant [29 x i32] ; <[29 x i32]> [#uses=1] @.str89 = external constant [5 x i32] ; <[5 x i32]> [#uses=1] -define void @_ZNK10wxDateTime6FormatEPKwRKNS_8TimeZoneE(%struct.wxString* noalias sret %agg.result, %struct.wxDateTime* %this, i32* %format, %"struct.wxDateTime::TimeZone"* %tz) { +define void @_ZNK10wxDateTime6FormatEPKwRKNS_8TimeZoneE(%struct.wxString* noalias sret %agg.result, %struct.wxDateTime* %this, i32* %format, %"struct.wxDateTime::TimeZone"* %tz, i1 %foo) { entry: - br i1 false, label %bb116.i, label %bb115.critedge.i + br i1 %foo, label %bb116.i, label %bb115.critedge.i bb115.critedge.i: ; preds = %entry ret void bb116.i: ; preds = %entry - br i1 false, label %bb52.i.i, label %bb3118 + br i1 %foo, label %bb52.i.i, label %bb3118 bb3118: ; preds = %bb116.i ret void bb52.i.i: ; preds = %bb116.i - br i1 false, label %bb142.i, label %bb115.critedge.i.i + br i1 %foo, label %bb142.i, label %bb115.critedge.i.i bb115.critedge.i.i: ; preds = %bb52.i.i ret void bb142.i: ; preds = %bb52.i.i - br i1 false, label %bb161.i, label %bb182.i + br i1 %foo, label %bb161.i, label %bb182.i bb161.i: ; preds = %bb142.i br label %bb3261 bb182.i: ; preds = %bb142.i @@ -87,16 +87,16 @@ bb115.critedge.i.i8492: ; preds = %bb5809 ret void bb91.i8504: ; preds = %bb5809 - br i1 false, label %bb155.i8541, label %bb182.i8560 + br i1 %foo, label %bb155.i8541, label %bb182.i8560 bb155.i8541: ; preds = %bb91.i8504 %tmp156.i85398700 = invoke %struct.tm* @gmtime_r( i32* null, %struct.tm* null ) to label %bb182.i8560 unwind label %lpad ; <%struct.tm> [#uses=1] bb182.i8560: ; preds = %bb155.i8541, %bb91.i8504 %tm48.0.i8558 = phi %struct.tm [ null, %bb91.i8504 ], [ %tmp156.i85398700, %bb155.i8541 ] ; <%struct.tm> [#uses=0] - br i1 false, label %bb278.i8617, label %bb187.i8591 + br i1 %foo, label %bb278.i8617, label %bb187.i8591 bb187.i8591: ; preds = %bb182.i8560 %tmp245.i8588 = srem i64 0, 86400000 ; [#uses=1] - br i1 false, label %bb264.i8592, label %bb265.i8606 + br i1 %foo, label %bb264.i8592, label %bb265.i8606 bb264.i8592: ; preds = %bb187.i8591 ret void bb265.i8606: ; preds = %bb187.i8591 @@ -106,7 +106,7 @@ br label %invcont5814 bb278.i8617: ; preds = %bb182.i8560 %timeOnly50.0.i8622 = add i32 0, 0 ; [#uses=1] - br i1 false, label %bb440.i8663, label %bb448.i8694 + br i1 %foo, label %bb440.i8663, label %bb448.i8694 bb440.i8663: ; preds = %bb278.i8617 invoke void @_Z10wxOnAssertPKwiPKcS0_S0_( i32 getelementptr ([27 x i32]* @.str, i32 0, i32 0), i32 1717, i8* getelementptr ([6 x i8]* @_ZZNK10wxDateTime5GetTmERKNS_8TimeZoneEE12__FUNCTION__, i32 0, i32 0), i32* getelementptr ([29 x i32]* @.str33, i32 0, i32 0), i32* getelementptr ([14 x i32]* @.str4, i32 0, i32 0) ) to label %bb448.i8694 unwind label %lpad From resistor at mac.com Tue Aug 5 13:20:13 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 18:20:13 -0000 Subject: [llvm-commits] [llvm] r54359 - in /llvm/trunk/test/CodeGen/X86: 2007-07-25-EpilogueBug.ll 2008-04-17-CoalescerBug.ll 2008-05-06-SpillerBug.ll 2008-05-21-CoalescerBug.ll 2008-06-13-SpillerCommuting.ll ins_subreg_coalesce-3.ll Message-ID: <200808051820.m75IKWhW018855@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 13:19:14 2008 New Revision: 54359 URL: http://llvm.org/viewvc/llvm-project?rev=54359&view=rev Log: Update the remaining tests not to use -disable-correct-folding, and remove two that couldn't be updated. Removed: llvm/trunk/test/CodeGen/X86/2007-07-25-EpilogueBug.ll llvm/trunk/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll Modified: llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll llvm/trunk/test/CodeGen/X86/2008-05-06-SpillerBug.ll llvm/trunk/test/CodeGen/X86/2008-05-21-CoalescerBug.ll llvm/trunk/test/CodeGen/X86/ins_subreg_coalesce-3.ll Removed: llvm/trunk/test/CodeGen/X86/2007-07-25-EpilogueBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2007-07-25-EpilogueBug.ll?rev=54358&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2007-07-25-EpilogueBug.ll (original) +++ llvm/trunk/test/CodeGen/X86/2007-07-25-EpilogueBug.ll (removed) @@ -1,58 +0,0 @@ -; Verify that the addl comes before any popl. - -; RUN: llvm-as < %s \| llc -mtriple=i686-pc-linux-gnu -disable-correct-folding -mcpu=i386 \| \ -; RUN: %prcontext ret 1 \| grep popl -; PR1573 - - %struct.c34006f__TsB = type { i8, i32, i32, %struct.c34006f__TsB___b___XVN } - %struct.c34006f__TsB___b___XVN = type { %struct.c34006f__TsB___b___XVN___O } - %struct.c34006f__TsB___b___XVN___O = type { float } - -define fastcc i8 @c34006f__pkg__parentEQ.213(%struct.c34006f__TsB* %x, %struct.c34006f__TsB* %y) zeroext { -entry: - %tmp190 = icmp eq i8 0, 0 ; [#uses=1] - %tmp207 = icmp eq i32 0, 0 ; [#uses=1] - %bothcond = and i1 %tmp190, %tmp207 ; [#uses=1] - %tmp224 = icmp eq i32 0, 0 ; [#uses=1] - %bothcond1 = and i1 %bothcond, %tmp224 ; [#uses=1] - br i1 %bothcond1, label %cond_next229, label %UnifiedReturnBlock - -cond_next229: ; preds = %entry - %tmp234 = icmp eq i8 0, 0 ; [#uses=1] - br i1 %tmp234, label %cond_false391, label %cond_true237 - -cond_true237: ; preds = %cond_next229 - %tmp268 = icmp sgt i32 0, -1 ; [#uses=2] - %max269 = select i1 %tmp268, i32 0, i32 0 ; [#uses=1] - %tmp305.op = add i32 0, -1 ; [#uses=1] - br i1 false, label %bb328, label %cond_next315 - -cond_next315: ; preds = %cond_true237 - ret i8 0 - -bb328: ; preds = %cond_true237 - %tmp337 = select i1 %tmp268, i32 %tmp305.op, i32 -1 ; [#uses=1] - %tmp347 = icmp eq i32 %tmp337, 0 ; [#uses=1] - br i1 %tmp347, label %cond_next351, label %UnifiedReturnBlock - -cond_next351: ; preds = %bb328 - %tmp354 = getelementptr %struct.c34006f__TsB* %y, i32 0, i32 3 ; <%struct.c34006f__TsB___b___XVN> [#uses=1] - %tmp354355 = bitcast %struct.c34006f__TsB___b___XVN %tmp354 to i8* ; [#uses=1] - %tmp358 = getelementptr %struct.c34006f__TsB* %x, i32 0, i32 3 ; <%struct.c34006f__TsB___b___XVN> [#uses=1] - %tmp358359 = bitcast %struct.c34006f__TsB___b___XVN %tmp358 to i8* ; [#uses=1] - %tmp360 = tail call i32 (i8, i8, i32, ...)* @memcmp( i8* %tmp358359, i8* %tmp354355, i32 %max269 ) ; [#uses=0] - ret i8 0 - -cond_false391: ; preds = %cond_next229 - %tmp1 = getelementptr %struct.c34006f__TsB* %y, i32 0, i32 3, i32 0, i32 0 - %tmp2 = load float* %tmp1 - %tmp400 = fcmp une float %tmp2, 0.000000e+00 ; [#uses=1] - %not.tmp400 = xor i1 %tmp400, true ; [#uses=1] - %retval = zext i1 %not.tmp400 to i8 ; [#uses=1] - ret i8 %retval - -UnifiedReturnBlock: ; preds = %bb328, %entry - ret i8 0 -} - -declare i32 @memcmp(i8, i8, i32, ...) Modified: llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll?rev=54359&r1=54358&r2=54359&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll (original) +++ llvm/trunk/test/CodeGen/X86/2008-04-17-CoalescerBug.ll Tue Aug 5 13:19:14 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| llc -mtriple=i386-apple-darwin -disable-correct-folding \| grep xorl \| grep {%e} +; RUN: llvm-as < %s \| llc -mtriple=i386-apple-darwin \| grep xorl \| grep {%e} ; Make sure xorl operands are 32-bit registers. %struct.tm = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i8* } Modified: llvm/trunk/test/CodeGen/X86/2008-05-06-SpillerBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-05-06-SpillerBug.ll?rev=54359&r1=54358&r2=54359&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-05-06-SpillerBug.ll (original) +++ llvm/trunk/test/CodeGen/X86/2008-05-06-SpillerBug.ll Tue Aug 5 13:19:14 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-fp-elim -disable-correct-folding \| grep addb \| grep ebp +; RUN: llvm-as < %s \| llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-fp-elim \| grep addb \| grep ebp %struct.rc4_state = type { i32, i32, [256 x i32] } @.str1 = internal constant [65 x i8] c"m[%d] = 0x%02x, m[%d] = 0x%02x, 0x%02x, k = %d, key[k] = 0x%02x\0A\00" ; <[65 x i8]> [#uses=1] @@ -11,10 +11,12 @@ br label %bb25 bb25: ; preds = %bb25, %entry - br i1 false, label %bb.i, label %bb25 + %foo = phi i1 [ 0, %bb25], [ 1, %entry] + br i1 %foo, label %bb.i, label %bb25 bb.i: ; preds = %bb.i, %bb25 - br i1 false, label %bb21.i, label %bb.i + %foo2 = phi i1 [ 0, %bb.i], [1, %bb25] + br i1 %foo2, label %bb21.i, label %bb.i bb21.i: ; preds = %bb21.i, %bb.i %k.0.reg2mem.0.i = phi i32 [ %k.1.i, %bb21.i ], [ 0, %bb.i ] ; [#uses=2] Modified: llvm/trunk/test/CodeGen/X86/2008-05-21-CoalescerBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-05-21-CoalescerBug.ll?rev=54359&r1=54358&r2=54359&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-05-21-CoalescerBug.ll (original) +++ llvm/trunk/test/CodeGen/X86/2008-05-21-CoalescerBug.ll Tue Aug 5 13:19:14 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| llc -march=x86 -fast -disable-correct-folding \| grep mov \| count 4 +; RUN: llvm-as < %s \| llc -march=x86 -fast \| grep mov \| count 5 ; PR2343 %llvm.dbg.anchor.type = type { i32, i32 } @@ -80,10 +80,11 @@ bb497: ; preds = %bb483, %entry %cases.0 = phi %struct.tree_node [ %tmp496, %bb483 ], [ null, %entry ] ; <%struct.tree_node> [#uses=1] %last.0 = phi %struct.tree_node [ %cases.0, %bb483 ], [ undef, %entry ] ; <%struct.tree_node> [#uses=1] - br i1 false, label %bb483, label %bb502 + %foo = phi i1 [ 0, %bb483 ], [ 1, %entry ] + br i1 %foo, label %bb483, label %bb502 bb502: ; preds = %bb497 - br i1 false, label %bb507, label %bb841 + br i1 %foo, label %bb507, label %bb841 bb507: ; preds = %bb502 %tmp517 = getelementptr %struct.tree_node %last.0, i32 0, i32 0 ; <%struct.tree_function_decl> [#uses=1] Removed: llvm/trunk/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll?rev=54358&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll (original) +++ llvm/trunk/test/CodeGen/X86/2008-06-13-SpillerCommuting.ll (removed) @@ -1,42 +0,0 @@ -; RUN: llvm-as < %s \| llc -mtriple=i386-apple-darwin -relocation-model=pic -disable-correct-folding -stats \|& grep {spiller - Number of instructions commuted} - - %struct.CABAC_context_element = type { i8, i8 } - %struct.MB_Info_CABAC = type { i8, i8, [2 x i8], i8, i8, i8, i16, i16, [4 x i8], [8 x %struct.MotionVector] } - %struct.MotionVector = type { i16, i16 } - %struct.RBSP2 = type { i32, i32, i16, i8, i16, i16, <1 x i64>, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i8, i16, i8, %struct.MB_Info_CABAC, %struct.MB_Info_CABAC, [2 x %struct.MB_Info_CABAC], [12 x i8], [460 x %struct.CABAC_context_element], [10 x i8], [10 x i8], [10 x i16], [4 x [120 x i32]], [15 x [36 x i8]], [6 x [8 x i8]], i16 } - %struct.Slice_Info = type { i32, i8, %struct.seq_parameter_set_rbsp_t, %struct.seq_parameter_set_rbsp_t, i32, i16, i8, i8, i8, i8, i16, i32 } - %struct.seq_parameter_set_rbsp_t = type { i32, i32, i32 } - at _ZL21CABAC_CTX_state_table = external constant [64 x i16] ; <[64 x i16]> [#uses=1] - at _ZL15rLPS_table_64x4 = external constant [64 x [4 x i8]] ; <[64 x [4 x i8]]> [#uses=1] - -define i32 @_ZN5RBSP220residual_block_cabacEP10Slice_InfoP13MB_Info_CABACS3_hjhhbPtPs(%struct.RBSP2* %this, %struct.Slice_Info* %slice, %struct.MB_Info_CABAC* %up, %struct.MB_Info_CABAC* %left, i8 zeroext %maxNumCoeff, i32 %blk_i, i8 zeroext %iCbCr, i8 zeroext %ctxBlockCat, i8 zeroext %intra_flag, i16* %mask, i16* %res) nounwind { -entry: - %tmp43.i1590 = getelementptr %struct.RBSP2* %this, i32 0, i32 0 ; [#uses=1] - br label %bb803 - -bb803: ; preds = %_ZN5RBSP211decode_1bitEP21CABAC_context_element.exit1581, %entry - %numCoeff.11749 = phi i32 [ 0, %entry ], [ %numCoeff.11749.tmp868, %_ZN5RBSP211decode_1bitEP21CABAC_context_element.exit1581 ] ; [#uses=1] - %tmp28.i1503 = load i8* null, align 1 ; [#uses=1] - %tmp30.i1504 = getelementptr %struct.RBSP2* %this, i32 0, i32 25, i32 0, i32 0 ; [#uses=2] - %tmp31.i1505 = load i8* %tmp30.i1504, align 1 ; [#uses=1] - %tmp3233.i1506 = zext i8 %tmp31.i1505 to i32 ; [#uses=2] - %tmp35.i1507 = getelementptr [64 x i16]* @_ZL21CABAC_CTX_state_table, i32 0, i32 %tmp3233.i1506 ; [#uses=1] - %tmp36.i1508 = load i16* %tmp35.i1507, align 2 ; [#uses=1] - %tmp363738.i1509 = zext i16 %tmp36.i1508 to i32 ; [#uses=1] - %tmp51.i1514 = getelementptr [64 x [4 x i8]]* @_ZL15rLPS_table_64x4, i32 0, i32 %tmp3233.i1506, i32 0 ; [#uses=1] - %tmp52.i1515 = load i8* %tmp51.i1514, align 1 ; [#uses=1] - %tmp5758.i1516 = zext i8 %tmp52.i1515 to i32 ; [#uses=1] - %tmp60.i1517 = sub i32 0, %tmp5758.i1516 ; [#uses=1] - store i32 %tmp60.i1517, i32* %tmp43.i1590, align 16 - br i1 false, label %_ZN5RBSP211decode_1bitEP21CABAC_context_element.exit1581, label %bb.i1537 - -bb.i1537: ; preds = %bb803 - unreachable - -_ZN5RBSP211decode_1bitEP21CABAC_context_element.exit1581: ; preds = %bb803 - %tmp328329.i1580 = trunc i32 %tmp363738.i1509 to i8 ; [#uses=1] - store i8 %tmp328329.i1580, i8* %tmp30.i1504, align 1 - %toBool865 = icmp eq i8 %tmp28.i1503, 0 ; [#uses=1] - %numCoeff.11749.tmp868 = select i1 %toBool865, i32 %numCoeff.11749, i32 0 ; [#uses=1] - br label %bb803 -} Modified: llvm/trunk/test/CodeGen/X86/ins_subreg_coalesce-3.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/ins_subreg_coalesce-3.ll?rev=54359&r1=54358&r2=54359&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/ins_subreg_coalesce-3.ll (original) +++ llvm/trunk/test/CodeGen/X86/ins_subreg_coalesce-3.ll Tue Aug 5 13:19:14 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| llc -march=x86-64 -disable-correct-folding \| grep mov \| count 9 +; RUN: llvm-as < %s \| llc -march=x86-64 \| grep mov \| count 11 %struct.COMPOSITE = type { i8, i16, i16 } %struct.FILE = type { i8, i32, i32, i16, i16, %struct.__sbuf, i32, i8, i32 (i8), i32 (i8, i8, i32), i64 (i8, i64, i32), i32 (i8, i8, i32), %struct.__sbuf, %struct.__sFILEX, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 } @@ -17,21 +17,21 @@ %struct.metrics = type { i16, i16, i16, i16, i16 } %struct.rec = type { %struct.head_type } -define void @FontChange() { +define void @FontChange(i1 %foo) { entry: - br i1 false, label %bb298, label %bb49 + br i1 %foo, label %bb298, label %bb49 bb49: ; preds = %entry ret void bb298: ; preds = %entry - br i1 false, label %bb304, label %bb366 + br i1 %foo, label %bb304, label %bb366 bb304: ; preds = %bb298 - br i1 false, label %bb330, label %bb428 + br i1 %foo, label %bb330, label %bb428 bb330: ; preds = %bb366, %bb304 br label %bb366 bb366: ; preds = %bb330, %bb298 - br i1 false, label %bb330, label %bb428 + br i1 %foo, label %bb330, label %bb428 bb428: ; preds = %bb366, %bb304 - br i1 false, label %bb650, label %bb433 + br i1 %foo, label %bb650, label %bb433 bb433: ; preds = %bb428 ret void bb650: ; preds = %bb650, %bb428 @@ -56,7 +56,7 @@ ret void bb4932: ; preds = %bb4884 %tmp4933 = load i32 null, align 4 ; [#uses=1] - br i1 false, label %bb5054, label %bb4940 + br i1 %foo, label %bb5054, label %bb4940 bb4940: ; preds = %bb4932 %tmp4943 = load i32* null, align 4 ; [#uses=2] switch i32 %tmp4933, label %bb5054 [ From sabre at nondot.org Tue Aug 5 13:21:24 2008 From: sabre at nondot.org (Chris Lattner) Date: Tue, 05 Aug 2008 18:21:24 -0000 Subject: [llvm-commits] [llvm] r54360 - /llvm/trunk/docs/LangRef.html Message-ID: <200808051821.m75ILRNE018899@zion.cs.uiuc.edu> Author: lattner Date: Tue Aug 5 13:21:08 2008 New Revision: 54360 URL: http://llvm.org/viewvc/llvm-project?rev=54360&view=rev Log: Capitalize LLVM, suggested by Walt Pawley Modified: llvm/trunk/docs/LangRef.html Modified: llvm/trunk/docs/LangRef.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=54360&r1=54359&r2=54360&view=diff ============================================================================== --- llvm/trunk/docs/LangRef.html (original) +++ llvm/trunk/docs/LangRef.html Tue Aug 5 13:21:08 2008 @@ -849,7 +849,7 @@ This indicates that the pointer parameter should really be passed by value to the function. The attribute implies that a hidden copy of the pointee is made between the caller and the callee, so the callee is unable - to modify the value in the callee. This attribute is only valid on llvm + to modify the value in the callee. This attribute is only valid on LLVM pointer arguments. It is generally used to pass structs and arrays by value, but is also valid on scalars (even though this is silly). @@ -997,7 +997,7 @@ `v128:128:128` - 128-bit vector is 128-bit aligned `a0:0:1` - aggregates are 8-bit aligned - When llvm is determining the alignment for a given type, it uses the + When LLVM is determining the alignment for a given type, it uses the following rules: If the type sought is an exact match for one of the specifications, that From resistor at mac.com Tue Aug 5 13:28:27 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 18:28:27 -0000 Subject: [llvm-commits] [llvm] r54361 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Message-ID: <200808051828.m75ISYVl019093@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 13:27:54 2008 New Revision: 54361 URL: http://llvm.org/viewvc/llvm-project?rev=54361&view=rev Log: Remove the -disable-correct-folding option, which was ugly and is no longer needed. Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54361&r1=54360&r2=54361&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Tue Aug 5 13:27:54 2008 @@ -53,9 +53,6 @@ EnableValueProp("enable-value-prop", cl::Hidden); static cl::opt EnableLegalizeTypes("enable-legalize-types", cl::Hidden); -static cl::opt -DisableCorrectBranchFolding("disable-correct-folding", cl::init(false), - cl::Hidden); #ifndef NDEBUG @@ -1638,14 +1635,12 @@ // If the branch was constant folded, fix up the CFG. if (BrCond.getOpcode() == ISD::BR) { - if (!DisableCorrectBranchFolding) - CurMBB->removeSuccessor(CB.FalseBB); + CurMBB->removeSuccessor(CB.FalseBB); DAG.setRoot(BrCond); } else { // Otherwise, go ahead and insert the false branch. if (BrCond == getControlRoot()) - if (!DisableCorrectBranchFolding) - CurMBB->removeSuccessor(CB.TrueBB); + CurMBB->removeSuccessor(CB.TrueBB); if (CB.FalseBB == NextBlock) DAG.setRoot(BrCond); From sabre at nondot.org Tue Aug 5 13:29:19 2008 From: sabre at nondot.org (Chris Lattner) Date: Tue, 05 Aug 2008 18:29:19 -0000 Subject: [llvm-commits] [llvm] r54362 - /llvm/trunk/docs/LangRef.html Message-ID: <200808051829.m75ITLZG019123@zion.cs.uiuc.edu> Author: lattner Date: Tue Aug 5 13:29:16 2008 New Revision: 54362 URL: http://llvm.org/viewvc/llvm-project?rev=54362&view=rev Log: Expand acronyms, suggested by Walter Pawley Modified: llvm/trunk/docs/LangRef.html Modified: llvm/trunk/docs/LangRef.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=54362&r1=54361&r2=54362&view=diff ============================================================================== --- llvm/trunk/docs/LangRef.html (original) +++ llvm/trunk/docs/LangRef.html Tue Aug 5 13:29:16 2008 @@ -255,9 +255,9 @@ This document is a reference manual for the LLVM assembly language. -LLVM is an SSA based representation that provides type safety, -low-level operations, flexibility, and the capability of representing -'all' high-level languages cleanly. It is the common code +LLVM is an Static Single Assignment (SSA) based representation that provides +type safety, low-level operations, flexibility, and the capability of +representing 'all' high-level languages cleanly. It is the common code representation used throughout all phases of the LLVM compilation strategy. @@ -522,9 +522,9 @@ `extern_weak`: - The semantics of this linkage follow the ELF model: the symbol is weak - until linked, if not linked, the symbol becomes null instead of being an - undefined reference. + The semantics of this linkage follow the ELF object file model: the + symbol is weak until linked, if not linked, the symbol becomes null instead + of being an undefined reference. `externally visible`: @@ -538,7 +538,7 @@ The next two types of linkage are targeted for Microsoft Windows platform only. They are designed to support importing (exporting) symbols from (to) - DLLs. + DLLs (Dynamic Link Libraries). @@ -602,8 +602,8 @@ This calling convention attempts to make calls as fast as possible (e.g. by passing things in registers). This calling convention allows the target to use whatever tricks it wants to produce fast code for the target, - without having to conform to an externally specified ABI. Implementations of - this convention should allow arbitrary + without having to conform to an externally specified ABI (Application Binary + Interface). Implementations of this convention should allow arbitrary tail call optimization to be supported. This calling convention does not support varargs and requires the prototype of all callees to exactly match the prototype of the function @@ -648,7 +648,8 @@ "`default`" - Default style: - On ELF, default visibility means that the declaration is visible to other + On targets that use the ELF object file format, default visibility means + that the declaration is visible to other modules and, in shared libraries, means that the declared entity may be overridden. On Darwin, default visibility means that the declaration is visible to other modules. Default visibility corresponds to "external @@ -760,7 +761,8 @@ name, a possibly empty list of arguments, an optional alignment, and an optional garbage collector name. - A function definition contains a list of basic blocks, forming the CFG for + A function definition contains a list of basic blocks, forming the CFG +(Control Flow Graph) for the function. Each basic block may optionally start with a label (giving the basic block a symbol table entry), contains a list of instructions, and ends with a terminator instruction (such as a branch or @@ -957,7 +959,7 @@ Specifies that the target lays out data in big-endian form. That is, the bits with the most significance have the lowest address location. `e` - Specifies that hte target lays out data in little-endian form. That is, + Specifies that the target lays out data in little-endian form. That is, the bits with the least significance have the lowest address location. `p:size:abi:pref` This specifies the size of a pointer and its abi and @@ -989,7 +991,7 @@ `i8:8:8` - i8 is 8-bit (byte) aligned `i16:16:16` - i16 is 16-bit aligned `i32:32:32` - i32 is 32-bit aligned - `i64:32:64` - i64 has abi alignment of 32-bits but preferred + `i64:32:64` - i64 has ABI alignment of 32-bits but preferred alignment of 64-bits `f32:32:32` - float is 32-bit aligned `f64:64:64` - double is 64-bit aligned @@ -1023,7 +1025,8 @@ The LLVM type system is one of the most important features of the intermediate representation. Being typed enables a number of -optimizations to be performed on the IR directly, without having to do +optimizations to be performed on the intermediate representation directly, +without having to do extra analyses on the side before the transformation. A strong type system makes it easier to read the generated code and enables novel analyses and transformations that are not feasible to perform on normal @@ -4515,7 +4518,8 @@ LLVM support for Accurate Garbage -Collection requires the implementation and generation of these intrinsics. +Collection (GC) requires the implementation and generation of these +intrinsics. These intrinsics allow identification of GC roots on the stack, as well as garbage collector implementations that require read and write barriers. @@ -4867,11 +4871,12 @@ The '`llvm.pcmarker`' intrinsic is a method to export a Program Counter -(PC) in a region of -code to simulators and other tools. The method is target specific, but it is -expected that the marker will use exported symbols to transmit the PC of the marker. -The marker makes no guarantees that it will remain with any specific instruction -after optimizations. It is possible that the presence of a marker will inhibit +(PC) in a region of +code to simulators and other tools. The method is target specific, but it is +expected that the marker will use exported symbols to transmit the PC of the +marker. +The marker makes no guarantees that it will remain with any specific instruction +after optimizations. It is possible that the presence of a marker will inhibit optimizations. The intended use is to be inserted after optimizations to allow correlations of simulation runs. @@ -5691,7 +5696,8 @@ These intrinsic functions expand the "universal IR" of LLVM to represent hardware constructs for atomic operations and memory synchronization. This provides an interface to the hardware, not an interface to the programmer. It - is aimed at a low enough level to allow any programming models or APIs which + is aimed at a low enough level to allow any programming models or APIs + (Application Programming Interfaces) which need atomic behaviors to map cleanly onto it. It is also modeled primarily on hardware behavior. Just as hardware provides a "universal IR" for source languages, it also provides a starting point for developing a "universal" From viridia at gmail.com Tue Aug 5 13:35:50 2008 From: viridia at gmail.com (Talin) Date: Tue, 5 Aug 2008 11:35:50 -0700 Subject: [llvm-commits] DebugInfoBuilder Message-ID: The attached patch file contains an initial implementation of DebugInfoBuilder, which is intended to help generate DWARF debugging information. Currently it only has support for creating global descriptors, I have not yet implemented descriptors for aggregate types or stop points. The API tries to simplify the task of creating descriptors by using the IR types. For example, instead of having to manually specify the size and alignment of an integer, you can just pass an IntegerType to CreateIntegerTypeDescriptor and it will figure that out for you. However, in some cases you'll need to pass extra information which is not represented in the IR - so for example CreateIntegerTypeDescriptor takes an argument indicating whether the type is intended to be signed or unsigned (since the IR integer type has no concept of signed-ness.) -- -- Talin -------------- next part -------------- An HTML attachment was scrubbed... URL: http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080805/195693da/attachment.html -------------- next part -------------- A non-text attachment was scrubbed... Name: DIB.patch Type: application/octet-stream Size: 17898 bytes Desc: not available Url : http://lists.cs.uiuc.edu/pipermail/llvm-commits/attachments/20080805/195693da/attachment.obj From clattner at apple.com Tue Aug 5 13:42:24 2008 From: clattner at apple.com (Chris Lattner) Date: Tue, 5 Aug 2008 11:42:24 -0700 Subject: [llvm-commits] [llvm] r54334 - in /llvm/trunk/test/CodeGen: ARM/2007-08-15-ReuseBug.ll ARM/remat.ll X86/2007-07-25-EpilogueBug.ll X86/2007-11-14-Coalescer-Bug.ll X86/2007-11-30-LoadFolding-Bug.ll X86/2007-11-30-TestLoadFolding.ll X86/2008-04-17-CoalescerBug.ll X86/2008-05-06-SpillerBug.ll X86/2008-05-21-CoalescerBug.ll X86/2008-06-13-SpillerCommuting.ll X86/ins_subreg_coalesce-3.ll In-Reply-To: <79858346-2671-4355-997F-E9324B9FCF4A@apple.com> References: <200808042355.m74NtUQ8000644@zion.cs.uiuc.edu> <33F024A1-126D-4B5A-ADAC-02126683C5C8@apple.com> <3BAE6DC5-F79A-4E79-9412-6C122152A641@apple.com> <81E6A2A0-2A28-423E-8D37-B46ADAB42C87@apple.com> <79858346-2671-4355-997F-E9324B9FCF4A@apple.com> Message-ID: <4F7F0740-0F75-4CC4-A1D1-6D0DD544F9FC@apple.com> On Aug 5, 2008, at 10:53 AM, Evan Cheng wrote: > On Aug 5, 2008, at 9:31 AM, Chris Lattner wrote: >> On Aug 5, 2008, at 12:27 AM, Evan Cheng wrote: >>> I believe there are 11 test cases that cannot be trivially fixed. I >>> am >>> not sure how easy it is to go back and re-reduce these tests? That >>> can >>> take a lot of time. >> >> Which tests? What are they doing? Why not just add non-dead edges >> (e.g. new bool arguments to the function or load of a bool for branch >> conditions) in the CFG to prevent the blocks from being deleted? > > You do realize that's not always possible? Any tests that are > dependent on behavior of register allocator / spiller / coalescer are > very fragile as it is. Do you intend to add a new option every time a change to codegen potentially perturbs one of these tests? They should be updated or removed if they are too fragile. Changing the RUN line of a test is perfectly acceptable. > That's fine. Just realize some tests will not end up testing the same > thing and some may end up being removed. Understood, thanks -Chris From clattner at apple.com Tue Aug 5 13:42:54 2008 From: clattner at apple.com (Chris Lattner) Date: Tue, 5 Aug 2008 11:42:54 -0700 Subject: [llvm-commits] [llvm] r54361 - /llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp In-Reply-To: <200808051828.m75ISYVl019093@zion.cs.uiuc.edu> References: <200808051828.m75ISYVl019093@zion.cs.uiuc.edu> Message-ID: On Aug 5, 2008, at 11:28 AM, Owen Anderson wrote: > Author: resistor > Date: Tue Aug 5 13:27:54 2008 > New Revision: 54361 > > URL: http://llvm.org/viewvc/llvm-project?rev=54361&view=rev > Log: > Remove the -disable-correct-folding option, which was ugly and is no > longer needed. Yay, thanks Owen! -Chris From evan.cheng at apple.com Tue Aug 5 15:22:40 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 5 Aug 2008 13:22:40 -0700 Subject: [llvm-commits] DebugInfoBuilder In-Reply-To: References: Message-ID: <75963E22-3FE2-4914-9AC7-9CEA5CFAC9CD@apple.com> Very nice! This is sorely needed. Some comments: + // Calculate the size of the specified LLVM type. + Constant * Sizeof(const Type * type); + + // Calculate the alignment of the specified LLVM type. + Constant * Alignof(const Type * type); I find these names confusing. Perhaps getSize and getAlignment? That follows the convention which are used elsewhere in LLVM. + /// Set the reference to the module where we will insert debugging information. + /// Also defines the debug info types for the module and creates the initial anchors. + /// Also changes the current context to the global context for that module. + void SetModule(Module * m); 80 column please. :-) +// = = =---------------------------------------------------------------------- ===// +// Debug version -- copied from MachineModuleInfo (for now), in order to avoid +// creating a dependency on CodeGen. These declarations really should be moved +// to a better place where modules can get at them without being dependent on +// CodeGen. +enum { + LLVMDebugVersion = (6 << 16), // Current version of debug information. + LLVMDebugVersion5 = (5 << 16), // Constant for version 5. + LLVMDebugVersion4 = (4 << 16), // Constant for version 4. + LLVMDebugVersionMask = 0xffff0000 // Mask for version number. +}; What are the different versions? +GlobalVariable * DebugInfoBuilder::CreateCompileUnitDescriptor(unsigned langId, + const sys::Path & srcPath, const std::string & producer) { + + if (compileUnit == NULL) { + std::vector values; + values.push_back(ConstantInt::get(Type::Int32Ty, LLVMDebugVersion + dwarf::DW_TAG_compile_unit)); + values.push_back(ConstantExpr::getBitCast(compileUnitAnchor, anyPtrType)); + values.push_back(ConstantInt::get(Type::Int32Ty, langId)); + values.push_back(ConstantArray::get(srcPath.getLast())); + values.push_back(ConstantArray::get(srcPath.getDirname() + "/")); + values.push_back(ConstantArray::get(producer)); + + Constant * structVal = ConstantStruct::get(values, false); It would be nice if there is a ConstantStruct::get that takes SmallVectorImpl instead (hint :-). Then we can avoid heap allocation for a small vector. Thanks, Evan On Aug 5, 2008, at 11:35 AM, Talin wrote: > The attached patch file contains an initial implementation of > DebugInfoBuilder, which is intended to help generate DWARF debugging > information. Currently it only has support for creating global > descriptors, I have not yet implemented descriptors for aggregate > types or stop points. > > The API tries to simplify the task of creating descriptors by using > the IR types. For example, instead of having to manually specify the > size and alignment of an integer, you can just pass an IntegerType > to CreateIntegerTypeDescriptor and it will figure that out for you. > However, in some cases you'll need to pass extra information which > is not represented in the IR - so for example > CreateIntegerTypeDescriptor takes an argument indicating whether the > type is intended to be signed or unsigned (since the IR integer type > has no concept of signed-ness.) > > -- > -- Talin > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From resistor at mac.com Tue Aug 5 15:51:26 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 20:51:26 -0000 Subject: [llvm-commits] [llvm] r54369 - /llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Message-ID: <200808052051.m75KpQVq024003@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 15:51:26 2008 New Revision: 54369 URL: http://llvm.org/viewvc/llvm-project?rev=54369&view=rev Log: We don't need to update live intervals for dead PHIs. Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=54369&r1=54368&r2=54369&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original) +++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Tue Aug 5 15:51:26 2008 @@ -884,38 +884,41 @@ I != E; ) { MachineInstr* PInstr = (I++); - // Trim live intervals of input registers. They are no longer live into - // this block. - for (unsigned i = 1; i < PInstr->getNumOperands(); i += 2) { - unsigned reg = PInstr->getOperand(i).getReg(); - MachineBasicBlock MBB = PInstr->getOperand(i+1).getMBB(); - LiveInterval& InputI = LI.getInterval(reg); - if (MBB != PInstr->getParent() && - InputI.liveAt(LI.getMBBStartIdx(PInstr->getParent()))) - InputI.removeRange(LI.getMBBStartIdx(PInstr->getParent()), - LI.getInstructionIndex(PInstr), - true); - } - - // If this is a dead PHI node, then remove it from LiveIntervals. - unsigned DestReg = PInstr->getOperand(0).getReg(); - LiveInterval& PI = LI.getInterval(DestReg); - if (PInstr->registerDefIsDead(DestReg)) { - if (PI.containsOneValue()) { - LI.removeInterval(DestReg); + // Don't do live interval updating for dead PHIs. + if (!PInstr->registerDefIsDead(PInstr->getOperand(0).getReg())) { + // Trim live intervals of input registers. They are no longer live into + // this block. + for (unsigned i = 1; i < PInstr->getNumOperands(); i += 2) { + unsigned reg = PInstr->getOperand(i).getReg(); + MachineBasicBlock* MBB = PInstr->getOperand(i+1).getMBB(); + LiveInterval& InputI = LI.getInterval(reg); + if (MBB != PInstr->getParent() && + InputI.liveAt(LI.getMBBStartIdx(PInstr->getParent()))) + InputI.removeRange(LI.getMBBStartIdx(PInstr->getParent()), + LI.getInstructionIndex(PInstr), + true); + } + + // If this is a dead PHI node, then remove it from LiveIntervals. + unsigned DestReg = PInstr->getOperand(0).getReg(); + LiveInterval& PI = LI.getInterval(DestReg); + if (PInstr->registerDefIsDead(DestReg)) { + if (PI.containsOneValue()) { + LI.removeInterval(DestReg); + } else { + unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr)); + PI.removeRange(PI.getLiveRangeContaining(idx), true); + } } else { + // If the PHI is not dead, then the valno defined by the PHI + // now has an unknown def. unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr)); - PI.removeRange(PI.getLiveRangeContaining(idx), true); + const LiveRange* PLR = PI.getLiveRangeContaining(idx); + PLR->valno->def = ~0U; + LiveRange R (LI.getMBBStartIdx(PInstr->getParent()), + PLR->start, PLR->valno); + PI.addRange(R); } - } else { - // If the PHI is not dead, then the valno defined by the PHI - // now has an unknown def. - unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr)); - const LiveRange* PLR = PI.getLiveRangeContaining(idx); - PLR->valno->def = ~0U; - LiveRange R (LI.getMBBStartIdx(PInstr->getParent()), - PLR->start, PLR->valno); - PI.addRange(R); } LI.RemoveMachineInstrFromMaps(PInstr); From gohman at apple.com Tue Aug 5 16:13:05 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 05 Aug 2008 21:13:05 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54370 - /llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Message-ID: <200808052113.m75LD5KK024734@zion.cs.uiuc.edu> Author: djg Date: Tue Aug 5 16:13:04 2008 New Revision: 54370 URL: http://llvm.org/viewvc/llvm-project?rev=54370&view=rev Log: Use uint64_t more consistently for field offsets, including bitfield offsets. This fixes gcc.c-torture/compile/961203-1.c. Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-types.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-types.cpp?rev=54370&r1=54369&r2=54370&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-types.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-types.cpp Tue Aug 5 16:13:04 2008 @@ -518,14 +518,14 @@ /// FindLLVMTypePadding - If the specified struct has any inter-element padding, /// add it to the Padding array. -static void FindLLVMTypePadding(const Type Ty, unsigned BitOffset, - SmallVector, 16> &Padding) { +static void FindLLVMTypePadding(const Type Ty, uint64_t BitOffset, + SmallVector, 16> &Padding) { if (const StructType STy = dyn_cast(Ty)) { const TargetData &TD = getTargetData(); const StructLayout SL = TD.getStructLayout(STy); - unsigned PrevFieldBitOffset = 0; + uint64_t PrevFieldBitOffset = 0; for (unsigned i = 0, e = STy->getNumElements(); i != e; ++i) { - unsigned FieldBitOffset = SL->getElementOffset(i)8; + uint64_t FieldBitOffset = SL->getElementOffset(i)8; // Get padding of sub-elements. FindLLVMTypePadding(STy->getElementType(i), @@ -533,7 +533,7 @@ // Check to see if there is any padding between this element and the // previous one. if (i) { - unsigned PrevFieldEnd = + uint64_t PrevFieldEnd = PrevFieldBitOffset+TD.getTypeSizeInBits(STy->getElementType(i-1)); if (PrevFieldEnd < FieldBitOffset) Padding.push_back(std::make_pair(PrevFieldEnd+BitOffset, @@ -545,7 +545,7 @@ // Check for tail padding. if (unsigned EltCount = STy->getNumElements()) { - unsigned PrevFieldEnd = PrevFieldBitOffset + + uint64_t PrevFieldEnd = PrevFieldBitOffset + TD.getTypeSizeInBits(STy->getElementType(EltCount-1)); if (PrevFieldEnd < SL->getSizeInBytes()8) Padding.push_back(std::make_pair(PrevFieldEnd, @@ -553,7 +553,7 @@ } } else if (const ArrayType ATy = dyn_cast(Ty)) { - unsigned EltSize = getTargetData().getTypeSizeInBits(ATy->getElementType()); + uint64_t EltSize = getTargetData().getTypeSizeInBits(ATy->getElementType()); for (unsigned i = 0, e = ATy->getNumElements(); i != e; ++i) FindLLVMTypePadding(ATy->getElementType(), BitOffset+iEltSize, Padding); } @@ -661,7 +661,7 @@ if (TREE_CODE(DECL_FIELD_OFFSET(Field)) != INTEGER_CST) return true; - unsigned FieldBitOffset = getFieldOffsetInBits(Field); + uint64_t FieldBitOffset = getFieldOffsetInBits(Field); if (GCCTypeOverlapsWithPadding(getDeclaredType(Field), PadStartBits-FieldBitOffset, PadSizeBits)) return true; @@ -695,7 +695,7 @@ const Type Ty) { // Start by finding all of the padding in the LLVM Type. - SmallVector, 16> StructPadding; + SmallVector, 16> StructPadding; FindLLVMTypePadding(Ty, 0, StructPadding); for (unsigned i = 0, e = StructPadding.size(); i != e; ++i) @@ -1324,7 +1324,7 @@ /// getTypeSize - Return the size of the specified type in bytes. /// - unsigned getTypeSize(const Type Ty) const { + uint64_t getTypeSize(const Type Ty) const { return TD.getABITypeSize(Ty); } @@ -1414,7 +1414,7 @@ // Get the LLVM type for the field. If this field is a bitfield, use the // declared type, not the shrunk-to-fit type that GCC gives us in TREE_TYPE. unsigned ByteAlignment = getTypeAlignment(Ty); - unsigned NextByteOffset = getNewElementByteOffset(ByteAlignment); + uint64_t NextByteOffset = getNewElementByteOffset(ByteAlignment); if (NextByteOffset > ByteOffset \|\| ByteAlignment > getGCCStructAlignmentInBytes()) { // LLVM disagrees as to where this field should go in the natural field @@ -1425,7 +1425,7 @@ // If alignment won't round us up to the right boundary, insert explicit // padding. if (NextByteOffset < ByteOffset) { - unsigned CurOffset = getNewElementByteOffset(1); + uint64_t CurOffset = getNewElementByteOffset(1); const Type Pad = Type::Int8Ty; if (SavedTy && LastFieldStartsAtNonByteBoundry) // We want to reuse SavedType to access this bit field. @@ -1457,7 +1457,7 @@ /// getNewElementByteOffset - If we add a new element with the specified /// alignment, what byte offset will it land at? - unsigned getNewElementByteOffset(unsigned ByteAlignment) { + uint64_t getNewElementByteOffset(unsigned ByteAlignment) { if (Elements.empty()) return 0; uint64_t LastElementEnd = ElementOffsetInBytes.back() + ElementSizeInBytes.back(); @@ -1480,7 +1480,7 @@ /// getFieldEndOffsetInBytes - Return the byte offset of the byte immediately /// after the specified field. For example, if FieldNo is 0 and the field /// is 4 bytes in size, this will return 4. - unsigned getFieldEndOffsetInBytes(unsigned FieldNo) const { + uint64_t getFieldEndOffsetInBytes(unsigned FieldNo) const { assert(FieldNo < ElementOffsetInBytes.size() && "Invalid field #!"); return ElementOffsetInBytes[FieldNo]+ElementSizeInBytes[FieldNo]; } @@ -1488,7 +1488,7 @@ /// getEndUnallocatedByte - Return the first byte that isn't allocated at the /// end of a structure. For example, for {}, it's 0, for {int} it is 4, for /// {int,short}, it is 6. - unsigned getEndUnallocatedByte() const { + uint64_t getEndUnallocatedByte() const { if (ElementOffsetInBytes.empty()) return 0; return getFieldEndOffsetInBytes(ElementOffsetInBytes.size()-1); } @@ -1547,7 +1547,7 @@ return ~0U; } - void addNewBitField(unsigned Size, unsigned FirstUnallocatedByte); + void addNewBitField(uint64_t Size, uint64_t FirstUnallocatedByte); void dump() const; }; @@ -1555,8 +1555,8 @@ // Add new element which is a bit field. Size is not the size of bit filed, // but size of bits required to determine type of new Field which will be // used to access this bit field. -void StructTypeConversionInfo::addNewBitField(unsigned Size, - unsigned FirstUnallocatedByte) { +void StructTypeConversionInfo::addNewBitField(uint64_t Size, + uint64_t FirstUnallocatedByte) { // Figure out the LLVM type that we will use for the new field. // Note, Size is not necessarily size of the new field. It indicates @@ -1859,13 +1859,13 @@ return; // Get the starting offset in the record. - unsigned StartOffsetInBits = getFieldOffsetInBits(Field); - unsigned EndBitOffset = FieldSizeInBits+StartOffsetInBits; + uint64_t StartOffsetInBits = getFieldOffsetInBits(Field); + uint64_t EndBitOffset = FieldSizeInBits+StartOffsetInBits; // If the last inserted LLVM field completely contains this bitfield, just // ignore this field. if (!Info.Elements.empty()) { - unsigned LastFieldBitOffset = Info.ElementOffsetInBytes.back()8; + uint64_t LastFieldBitOffset = Info.ElementOffsetInBytes.back()8; unsigned LastFieldBitSize = Info.ElementSizeInBytes.back()8; assert(LastFieldBitOffset <= StartOffsetInBits && "This bitfield isn't part of the last field!"); @@ -1886,12 +1886,12 @@ // Compute the number of bits that we need to add to this struct to cover // this field. - unsigned FirstUnallocatedByte = Info.getEndUnallocatedByte(); - unsigned StartOffsetFromByteBoundry = StartOffsetInBits & 7; + uint64_t FirstUnallocatedByte = Info.getEndUnallocatedByte(); + uint64_t StartOffsetFromByteBoundry = StartOffsetInBits & 7; if (StartOffsetInBits < FirstUnallocatedByte8) { - unsigned AvailableBits = FirstUnallocatedByte 8 - StartOffsetInBits; + uint64_t AvailableBits = FirstUnallocatedByte * 8 - StartOffsetInBits; // This field's starting point is already allocated. if (StartOffsetFromByteBoundry == 0) { // This field starts at byte boundry. Need to allocate space From resistor at mac.com Tue Aug 5 16:18:52 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 21:18:52 -0000 Subject: [llvm-commits] [llvm] r54371 - /llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Message-ID: <200808052118.m75LIqmt024928@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 16:18:51 2008 New Revision: 54371 URL: http://llvm.org/viewvc/llvm-project?rev=54371&view=rev Log: Oops, we were already checking for dead phis. Handle this the proper way, then. Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=54371&r1=54370&r2=54371&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original) +++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Tue Aug 5 16:18:51 2008 @@ -884,8 +884,17 @@ I != E; ) { MachineInstr* PInstr = (I++); - // Don't do live interval updating for dead PHIs. - if (!PInstr->registerDefIsDead(PInstr->getOperand(0).getReg())) { + // If this is a dead PHI node, then remove it from LiveIntervals. + unsigned DestReg = PInstr->getOperand(0).getReg(); + LiveInterval& PI = LI.getInterval(DestReg); + if (PInstr->registerDefIsDead(DestReg)) { + if (PI.containsOneValue()) { + LI.removeInterval(DestReg); + } else { + unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr)); + PI.removeRange(PI.getLiveRangeContaining(idx), true); + } + } else { // Trim live intervals of input registers. They are no longer live into // this block. for (unsigned i = 1; i < PInstr->getNumOperands(); i += 2) { @@ -899,26 +908,14 @@ true); } - // If this is a dead PHI node, then remove it from LiveIntervals. - unsigned DestReg = PInstr->getOperand(0).getReg(); - LiveInterval& PI = LI.getInterval(DestReg); - if (PInstr->registerDefIsDead(DestReg)) { - if (PI.containsOneValue()) { - LI.removeInterval(DestReg); - } else { - unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr)); - PI.removeRange(PI.getLiveRangeContaining(idx), true); - } - } else { - // If the PHI is not dead, then the valno defined by the PHI - // now has an unknown def. - unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr)); - const LiveRange PLR = PI.getLiveRangeContaining(idx); - PLR->valno->def = ~0U; - LiveRange R (LI.getMBBStartIdx(PInstr->getParent()), - PLR->start, PLR->valno); - PI.addRange(R); - } + // If the PHI is not dead, then the valno defined by the PHI + // now has an unknown def. + unsigned idx = LI.getDefIndex(LI.getInstructionIndex(PInstr)); + const LiveRange* PLR = PI.getLiveRangeContaining(idx); + PLR->valno->def = ~0U; + LiveRange R (LI.getMBBStartIdx(PInstr->getParent()), + PLR->start, PLR->valno); + PI.addRange(R); } LI.RemoveMachineInstrFromMaps(PInstr); From isanbard at gmail.com Tue Aug 5 16:23:45 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 05 Aug 2008 21:23:45 -0000 Subject: [llvm-commits] [llvm] r54372 - in /llvm/trunk: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/2008-07-08-AndICmp.ll Message-ID: <200808052123.m75LNjCH025126@zion.cs.uiuc.edu> Author: void Date: Tue Aug 5 16:23:45 2008 New Revision: 54372 URL: http://llvm.org/viewvc/llvm-project?rev=54372&view=rev Log: Revert r53282. This was causing a miscompile on Linux. Also, the transformation looks bogus. Please see PR2629 for details on why this is breaking things. Removed: llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=54372&r1=54371&r2=54372&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Aug 5 16:23:45 2008 @@ -3586,22 +3586,6 @@ } } - - { // (icmp ugt/ult A, C) & (icmp B, C) --> (icmp (A\|B), C) - // where C is a power of 2 - Value A, B; - ConstantInt C1, C2; - ICmpInst::Predicate LHSCC, RHSCC; - if (match(&I, m_And(m_ICmp(LHSCC, m_Value(A), m_ConstantInt(C1)), - m_ICmp(RHSCC, m_Value(B), m_ConstantInt(C2))))) - if (C1 == C2 && LHSCC == RHSCC && C1->getValue().isPowerOf2() && - (LHSCC == ICmpInst::ICMP_ULT \|\| LHSCC == ICmpInst::ICMP_UGT)) { - Instruction NewOr = BinaryOperator::CreateOr(A, B); - InsertNewInstBefore(NewOr, I); - return new ICmpInst(LHSCC, NewOr, C1); - } - } - if (ICmpInst RHS = dyn_cast(Op1)) { // (icmp1 A, B) & (icmp2 A, B) --> (icmp3 A, B) if (Instruction R = AssociativeOpt(I, FoldICmpLogical(this, RHS))) Removed: llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll?rev=54371&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll (removed) @@ -1,10 +0,0 @@ -; RUN: llvm-as < %s \| opt -instcombine \| llvm-dis \| grep icmp \| count 1 -; PR2330 - -define i1 @foo(i32 %a, i32 %b) nounwind { -entry: - icmp ult i32 %a, 8 ; :0 [#uses=1] - icmp ult i32 %b, 8 ; :1 [#uses=1] - and i1 %1, %0 ; :2 [#uses=1] - ret i1 %2 -} From resistor at mac.com Tue Aug 5 16:40:48 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 21:40:48 -0000 Subject: [llvm-commits] [llvm] r54374 - /llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Message-ID: <200808052140.m75LempP025805@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 16:40:45 2008 New Revision: 54374 URL: http://llvm.org/viewvc/llvm-project?rev=54374&view=rev Log: Correctly handle replacement and removal of PHIs with one incoming register. Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp?rev=54374&r1=54373&r2=54374&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp (original) +++ llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Tue Aug 5 16:40:45 2008 @@ -27,6 +27,7 @@ #include "llvm/Pass.h" #include "llvm/Type.h" #include "llvm/CodeGen/MachineFunctionPass.h" +#include "llvm/CodeGen/MachineRegisterInfo.h" #include "llvm/Support/CFG.h" #include "llvm/Support/Compiler.h" #include "llvm/Target/TargetInstrInfo.h" @@ -128,10 +129,15 @@ start->RemoveOperand(i-1); } - if (start->getNumOperands() == 1) { + if (start->getNumOperands() == 3) { MachineInstr* phi = start; + unsigned Input = phi->getOperand(1).getReg(); + unsigned Output = phi->getOperand(0).getReg(); + start++; phi->eraseFromParent(); + + F.getRegInfo().replaceRegWith(Output, Input); } else start++; } From evan.cheng at apple.com Tue Aug 5 16:51:54 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 05 Aug 2008 21:51:54 -0000 Subject: [llvm-commits] [llvm] r54375 - in /llvm/trunk: lib/CodeGen/VirtRegMap.cpp test/CodeGen/X86/2008-08-06-RewriterBug.ll Message-ID: <200808052151.m75LptF3026271@zion.cs.uiuc.edu> Author: evancheng Date: Tue Aug 5 16:51:46 2008 New Revision: 54375 URL: http://llvm.org/viewvc/llvm-project?rev=54375&view=rev Log: Fix PR2596: out of bound reference. Added: llvm/trunk/test/CodeGen/X86/2008-08-06-RewriterBug.ll Modified: llvm/trunk/lib/CodeGen/VirtRegMap.cpp Modified: llvm/trunk/lib/CodeGen/VirtRegMap.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/VirtRegMap.cpp?rev=54375&r1=54374&r2=54375&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/VirtRegMap.cpp (original) +++ llvm/trunk/lib/CodeGen/VirtRegMap.cpp Tue Aug 5 16:51:46 2008 @@ -560,8 +560,11 @@ if (!MO.isRegister() \|\| !MO.isUse() \|\| !MO.isKill()) continue; unsigned Reg = MO.getReg(); + if (TargetRegisterInfo::isVirtualRegister(Reg)) + continue; if (KillRegs) KillRegs->push_back(Reg); + assert(Reg < KillOps.size()); if (KillOps[Reg] == &MO) { RegKills.reset(Reg); KillOps[Reg] = NULL; @@ -943,9 +946,11 @@ return false; continue; } - PhysReg = VRM.getPhys(VirtReg); - if (!TRI->regsOverlap(PhysReg, UnfoldPR)) - continue; + if (VRM.hasPhys(VirtReg)) { + PhysReg = VRM.getPhys(VirtReg); + if (!TRI->regsOverlap(PhysReg, UnfoldPR)) + continue; + } // Ok, we'll need to reload the value into a register which makes // it impossible to perform the store unfolding optimization later. Added: llvm/trunk/test/CodeGen/X86/2008-08-06-RewriterBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/2008-08-06-RewriterBug.ll?rev=54375&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/2008-08-06-RewriterBug.ll (added) +++ llvm/trunk/test/CodeGen/X86/2008-08-06-RewriterBug.ll Tue Aug 5 16:51:46 2008 @@ -0,0 +1,40 @@ +; RUN: llvm-as < %s \| llc -march=x86 +; PR2596 + + at data = external global [400 x i64] ; <[400 x i64]> [#uses=5] + +define void @foo(double noalias, double* noalias) { + load i64* getelementptr ([400 x i64]* @data, i32 0, i64 200), align 4 ; :3 [#uses=1] + load i64* getelementptr ([400 x i64]* @data, i32 0, i64 199), align 4 ; :4 [#uses=1] + load i64* getelementptr ([400 x i64]* @data, i32 0, i64 198), align 4 ; :5 [#uses=2] + load i64* getelementptr ([400 x i64]* @data, i32 0, i64 197), align 4 ; :6 [#uses=1] + br i1 false, label %28, label %7 + +; :7 ; preds = %2 + load double getelementptr (double bitcast ([400 x i64]* @data to double*), i64 180), align 8 ; :8 [#uses=1] + bitcast double %8 to double* ; :9 [#uses=1] + ptrtoint double* %9 to i64 ; :10 [#uses=1] + mul i64 %4, %3 ; :11 [#uses=1] + add i64 0, %11 ; :12 [#uses=1] + shl i64 %12, 3 ; :13 [#uses=1] + sub i64 %10, %13 ; :14 [#uses=1] + add i64 %5, 0 ; :15 [#uses=1] + shl i64 %15, 3 ; :16 [#uses=1] + bitcast i64 %16 to i64 ; :17 [#uses=1] + mul i64 %6, %5 ; :18 [#uses=1] + add i64 0, %18 ; :19 [#uses=1] + shl i64 %19, 3 ; :20 [#uses=1] + sub i64 %17, %20 ; :21 [#uses=1] + add i64 0, %21 ; :22 [#uses=1] + add i64 0, %14 ; :23 [#uses=1] + br label %24 + +; :24 ; preds = %24, %7 + phi i64 [ 0, %24 ], [ %22, %7 ] ; :25 [#uses=1] + phi i64 [ 0, %24 ], [ %23, %7 ] ; :26 [#uses=0] + add i64 %25, 24 ; :27 [#uses=0] + br label %24 + +; :28 ; preds = %2 + unreachable +} From evan.cheng at apple.com Tue Aug 5 17:19:18 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Tue, 05 Aug 2008 22:19:18 -0000 Subject: [llvm-commits] [llvm] r54376 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp lib/Target/X86/X86InstrSSE.td test/CodeGen/X86/vfcmp.ll Message-ID: <200808052219.m75MJIHQ027393@zion.cs.uiuc.edu> Author: evancheng Date: Tue Aug 5 17:19:15 2008 New Revision: 54376 URL: http://llvm.org/viewvc/llvm-project?rev=54376&view=rev Log: Fix PR2620: Fix X86cmppd selection code so it expects operands to be v2f64. Added: llvm/trunk/test/CodeGen/X86/vfcmp.ll Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp llvm/trunk/lib/Target/X86/X86InstrSSE.td Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=54376&r1=54375&r2=54376&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Tue Aug 5 17:19:15 2008 @@ -4770,8 +4770,9 @@ if (isFP) { unsigned SSECC = 8; - unsigned Opc = Op0.getValueType() == MVT::v4f32 ? X86ISD::CMPPS : - X86ISD::CMPPD; + MVT VT0 = Op0.getValueType(); + assert(VT0 == MVT::v4f32 \|\| VT0 == MVT::v2f64); + unsigned Opc = VT0 == MVT::v4f32 ? X86ISD::CMPPS : X86ISD::CMPPD; bool Swap = false; switch (SetCCOpcode) { Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSSE.td?rev=54376&r1=54375&r2=54376&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrSSE.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrSSE.td Tue Aug 5 17:19:15 2008 @@ -1721,9 +1721,9 @@ [(set VR128:$dst, (int_x86_sse2_cmp_pd VR128:$src1, (memop addr:$src), imm:$cc))]>; } -def : Pat<(v2i64 (X86cmppd VR128:$src1, VR128:$src2, imm:$cc)), +def : Pat<(v2i64 (X86cmppd (v2f64 VR128:$src1), VR128:$src2, imm:$cc)), (CMPPDrri VR128:$src1, VR128:$src2, imm:$cc)>; -def : Pat<(v2i64 (X86cmppd VR128:$src1, (memop addr:$src2), imm:$cc)), +def : Pat<(v2i64 (X86cmppd (v2f64 VR128:$src1), (memop addr:$src2), imm:$cc)), (CMPPDrmi VR128:$src1, addr:$src2, imm:$cc)>; // Shuffle and unpack instructions Added: llvm/trunk/test/CodeGen/X86/vfcmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/vfcmp.ll?rev=54376&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/vfcmp.ll (added) +++ llvm/trunk/test/CodeGen/X86/vfcmp.ll Tue Aug 5 17:19:15 2008 @@ -0,0 +1,13 @@ +; RUN: llvm-as < %s \| llc -march=x86 -mattr=+sse2 +; PR2620 + +define void @t(i32 %m_task_id, i32 %start_x, i32 %end_x) nounwind { + vfcmp olt <2 x double> zeroinitializer, zeroinitializer ; <<2 x i64>>:1 [#uses=1] + extractelement <2 x i64> %1, i32 1 ; :2 [#uses=1] + lshr i64 %2, 63 ; :3 [#uses=1] + trunc i64 %3 to i1 ; :4 [#uses=1] + zext i1 %4 to i8 ; :5 [#uses=1] + insertelement <2 x i8> zeroinitializer, i8 %5, i32 1 ; <<2 x i8>>:6 [#uses=1] + store <2 x i8> %6, <2 x i8>* null + ret void +} From isanbard at gmail.com Tue Aug 5 17:23:59 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 05 Aug 2008 22:23:59 -0000 Subject: [llvm-commits] [llvm] r54377 - /llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Message-ID: <200808052223.m75MNxJf027727@zion.cs.uiuc.edu> Author: void Date: Tue Aug 5 17:23:59 2008 New Revision: 54377 URL: http://llvm.org/viewvc/llvm-project?rev=54377&view=rev Log: Testcase for PR2629. Added: llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Added: llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll?rev=54377&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll (added) +++ llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Tue Aug 5 17:23:59 2008 @@ -0,0 +1,23 @@ +; RUN: llvm-as < %s \| opt -instcombine \| llc -disable-fp-elim \| not grep orb +; PR2629 + +define void @f(i8* %x) nounwind { +entry: + br label %bb + +bb: + %g1 = getelementptr i8* %x, i32 0 + %l1 = load i8* %g1, align 1 + %s1 = sub i8 %l1, 6 + %c1 = icmp ugt i8 %s1, 2 + %s2 = sub i8 %l1, 10 + %c2 = icmp ugt i8 %s2, 2 + %a1 = and i1 %c1, %c2 + br i1 %a1, label %incompatible, label %okay + +okay: + ret void + +incompatible: + ret void +} From resistor at mac.com Tue Aug 5 17:24:40 2008 From: resistor at mac.com (Owen Anderson) Date: Tue, 05 Aug 2008 22:24:40 -0000 Subject: [llvm-commits] [llvm] r54378 - /llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Message-ID: <200808052224.m75MOeLV027802@zion.cs.uiuc.edu> Author: resistor Date: Tue Aug 5 17:24:40 2008 New Revision: 54378 URL: http://llvm.org/viewvc/llvm-project?rev=54378&view=rev Log: Fix breakage on ARM/2008-04-10-ScavengerAssert.ll. Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp?rev=54378&r1=54377&r2=54378&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp (original) +++ llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Tue Aug 5 17:24:40 2008 @@ -137,7 +137,8 @@ start++; phi->eraseFromParent(); - F.getRegInfo().replaceRegWith(Output, Input); + if (Input != Output) + F.getRegInfo().replaceRegWith(Output, Input); } else start++; } From isanbard at gmail.com Tue Aug 5 17:29:16 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 05 Aug 2008 22:29:16 -0000 Subject: [llvm-commits] [llvm] r54379 - /llvm/trunk/docs/LangRef.html Message-ID: <200808052229.m75MTGD8027971@zion.cs.uiuc.edu> Author: void Date: Tue Aug 5 17:29:16 2008 New Revision: 54379 URL: http://llvm.org/viewvc/llvm-project?rev=54379&view=rev Log: It's "a static", not "an static" Modified: llvm/trunk/docs/LangRef.html Modified: llvm/trunk/docs/LangRef.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=54379&r1=54378&r2=54379&view=diff ============================================================================== --- llvm/trunk/docs/LangRef.html (original) +++ llvm/trunk/docs/LangRef.html Tue Aug 5 17:29:16 2008 @@ -255,7 +255,7 @@ This document is a reference manual for the LLVM assembly language. -LLVM is an Static Single Assignment (SSA) based representation that provides +LLVM is a Static Single Assignment (SSA) based representation that provides type safety, low-level operations, flexibility, and the capability of representing 'all' high-level languages cleanly. It is the common code representation used throughout all phases of the LLVM compilation From gohman at apple.com Tue Aug 5 17:34:21 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 05 Aug 2008 22:34:21 -0000 Subject: [llvm-commits] [llvm] r54380 - /llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp Message-ID: <200808052234.m75MYLIq028131@zion.cs.uiuc.edu> Author: djg Date: Tue Aug 5 17:34:21 2008 New Revision: 54380 URL: http://llvm.org/viewvc/llvm-project?rev=54380&view=rev Log: Pass the computed iteration count value to RewriteLoopExitValues instead of having it call getIterationCount again. Modified: llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp Modified: llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp?rev=54380&r1=54379&r2=54380&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/IndVarSimplify.cpp Tue Aug 5 17:34:21 2008 @@ -90,7 +90,7 @@ std::set &DeadInsts); Instruction LinearFunctionTestReplace(Loop L, SCEV IterationCount, SCEVExpander &RW); - void RewriteLoopExitValues(Loop L); + void RewriteLoopExitValues(Loop L, SCEV IterationCount); void DeleteTriviallyDeadInstructions(std::set &Insts); }; @@ -303,7 +303,7 @@ /// final value of any expressions that are recurrent in the loop, and /// substitute the exit values from the loop into any instructions outside of /// the loop that use the final values of the current expressions. -void IndVarSimplify::RewriteLoopExitValues(Loop L) { +void IndVarSimplify::RewriteLoopExitValues(Loop L, SCEV IterationCount) { BasicBlock Preheader = L->getLoopPreheader(); // Scan all of the instructions in the loop, looking at those that have @@ -321,7 +321,7 @@ BlockToInsertInto = Preheader; BasicBlock::iterator InsertPt = BlockToInsertInto->getFirstNonPHI(); - bool HasConstantItCount = isa(SE->getIterationCount(L)); + bool HasConstantItCount = isa(IterationCount); std::set InstructionsToDelete; std::map ExitValues; @@ -458,7 +458,7 @@ // SCEVHandle IterationCount = SE->getIterationCount(L); if (!isa(IterationCount)) - RewriteLoopExitValues(L); + RewriteLoopExitValues(L, IterationCount); // Next, analyze all of the induction variables in the loop, canonicalizing // auxillary induction variables. From isanbard at gmail.com Tue Aug 5 18:36:01 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 05 Aug 2008 23:36:01 -0000 Subject: [llvm-commits] [llvm] r54384 - /llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Message-ID: <200808052336.m75Na2jY030027@zion.cs.uiuc.edu> Author: void Date: Tue Aug 5 18:36:00 2008 New Revision: 54384 URL: http://llvm.org/viewvc/llvm-project?rev=54384&view=rev Log: Add default architecture. Modified: llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Modified: llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll?rev=54384&r1=54383&r2=54384&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Tue Aug 5 18:36:00 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| opt -instcombine \| llc -disable-fp-elim \| not grep orb +; RUN: llvm-as < %s \| opt -instcombine \| llc -disable-fp-elim -march=x86 \| not grep orb ; PR2629 define void @f(i8* %x) nounwind { From gohman at apple.com Tue Aug 5 18:36:35 2008 From: gohman at apple.com (Dan Gohman) Date: Tue, 05 Aug 2008 23:36:35 -0000 Subject: [llvm-commits] [llvm] r54385 - /llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Message-ID: <200808052336.m75NaZI8030052@zion.cs.uiuc.edu> Author: djg Date: Tue Aug 5 18:36:35 2008 New Revision: 54385 URL: http://llvm.org/viewvc/llvm-project?rev=54385&view=rev Log: Use strcpy instead of sprintf here. This avoids a GCC 4.3 format-string warning. There wasn't actually a problem here, because the contents of the string are known. Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp?rev=54385&r1=54384&r2=54385&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Tue Aug 5 18:36:35 2008 @@ -343,7 +343,7 @@ switch (Last) { case '%': - sprintf(Buffer, FmtBuf); break; + strcpy(Buffer, "%"); break; case 'c': sprintf(Buffer, FmtBuf, uint32_t(Args[ArgNo++].IntVal.getZExtValue())); break; From isanbard at gmail.com Tue Aug 5 18:52:29 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 05 Aug 2008 23:52:29 -0000 Subject: [llvm-commits] [llvm] r54386 - /llvm/trunk/utils/buildit/build_llvm Message-ID: <200808052352.m75NqT5m030695@zion.cs.uiuc.edu> Author: void Date: Tue Aug 5 18:52:28 2008 New Revision: 54386 URL: http://llvm.org/viewvc/llvm-project?rev=54386&view=rev Log: Add ARM to the targets to build. Modified: llvm/trunk/utils/buildit/build_llvm Modified: llvm/trunk/utils/buildit/build_llvm URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/buildit/build_llvm?rev=54386&r1=54385&r2=54386&view=diff ============================================================================== --- llvm/trunk/utils/buildit/build_llvm (original) +++ llvm/trunk/utils/buildit/build_llvm Tue Aug 5 18:52:28 2008 @@ -83,7 +83,7 @@ if [ \! -f Makefile.config ]; then $SRC_DIR/llvm/configure --prefix=$DT_HOME/local \ - --enable-targets=x86,powerpc,cbe \ + --enable-targets=arm,x86,powerpc,cbe \ --enable-assertions=$LLVM_ASSERTIONS \ --enable-optimized=$LLVM_OPTIMIZED \ \|\| exit 1 From isanbard at gmail.com Tue Aug 5 18:53:16 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 05 Aug 2008 23:53:16 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54387 - /llvm-gcc-4.2/trunk/build_gcc Message-ID: <200808052353.m75NrG6L030727@zion.cs.uiuc.edu> Author: void Date: Tue Aug 5 18:53:16 2008 New Revision: 54387 URL: http://llvm.org/viewvc/llvm-project?rev=54387&view=rev Log: Merge over support for building ARM. Modified: llvm-gcc-4.2/trunk/build_gcc Modified: llvm-gcc-4.2/trunk/build_gcc URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=54387&r1=54386&r2=54387&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/build_gcc (original) +++ llvm-gcc-4.2/trunk/build_gcc Tue Aug 5 18:53:16 2008 @@ -6,9 +6,7 @@ # -arch arguments are different than configure arguments. We need to # translate them. -TRANSLATE_ARCH="sed -e s/ppc/powerpc/ -e s/i386/i686/ -e s/ppc64/powerpc64/" -TRANSLATE_TARGETS="sed -e s/ppc/powerpc/ -e s/i386/i686/ -e s/x86_64// \ - -e s/powerpc64// -e s/ppc64//" +TRANSLATE_ARCH="sed -e s/ppc/powerpc/ -e s/i386/i686/ -e s/armv6/arm/" OMIT_X86_64="sed -e s/x86_64//" # Build GCC the "Apple way". @@ -23,7 +21,7 @@ # compilers will generate code for. If the current machine isn't in # the list, a compiler for it will get built anyway, but won't be # installed. -TARGETS=`echo $2 \| $TRANSLATE_TARGETS \| $OMIT_X86_64` +TARGETS=`echo $2 \| $TRANSLATE_ARCH \| $OMIT_X86_64` # The GNU makefile target ('bootstrap' by default). BOOTSTRAP=${BOOTSTRAP-bootstrap} @@ -36,11 +34,13 @@ # $RC_NONARCH_CFLAGS (and mysteriously prepends '-pipe' thereto). # We will allow this to override the default $CFLAGS and $CXXFLAGS. +# LLVM LOCAL begin if [ "x$LLVM_DEBUG" == "x" ]; then CFLAGS="-g -O2 ${RC_NONARCH_CFLAGS/-pipe/}" else CFLAGS="-g" fi +# LLVM LOCAL end # This isn't a parameter; it is the architecture of the current machine. BUILD=`arch \| $TRANSLATE_ARCH` @@ -104,13 +104,24 @@ # to be built. It's VERS but only up to the second '.' (if there is one). MAJ_VERS=`echo $VERS \| sed 's/\([0-9]\.[0-9]\)[.-]./\1/'` +# APPLE LOCAL begin ARM ARM_CONFIGFLAGS +# For ARM, grab all system files from an SDK. +ARM_SYSROOT="/Developer/SDKs/Extra" +ARM_LIBSTDCXX_VERSION=4.2.1 +ARM_CONFIGFLAGS="--with-sysroot=\"$ARM_SYSROOT\" \ + --with-gxx-include-dir=\${prefix}/include/c++/$ARM_LIBSTDCXX_VERSION" +# APPLE LOCAL end ARM ARM_CONFIGFLAGS + # This is the libstdc++ version to use. LIBSTDCXX_VERSION=4.2.1 +# LLVM LOCAL begin # DO NOT USE $DEST_ROOT to check LIBSTDCXX_VERSION here. Directly use /usr here. # $DEST_ROOT is /Developer for llvm-gcc if [ ! -d "/usr/include/c++/$LIBSTDCXX_VERSION" ]; then LIBSTDCXX_VERSION=4.0.0 fi +# LLVM LOCAL end +NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=\${prefix}/include/c++/$LIBSTDCXX_VERSION" DARWIN_VERS=`uname -r \| sed 's/\..//'` echo DARWIN_VERS = $DARWIN_VERS @@ -129,14 +140,14 @@ mkdir $SRC_DIR \|\| exit 1 ln -s $ORIG_SRC_DIR/* $SRC_DIR/ \|\| exit 1 rm -rf $SRC_DIR/tcl $SRC_DIR/expect $SRC_DIR/dejagnu \|\| exit 1 - # Also remove libstdc++ since it is built from a separate project. +# LLVM LOCAL rm -rf $SRC_DIR/libstdc++-v3 \|\| exit 1 # Clean out old specs files rm -f /usr/lib/gcc//4.0.0/specs # These are the configure and build flags that are used. - +# LLVM LOCAL begin if [ "x$LLVM_DEBUG" == "x" ]; then CHECKING_FLAGS="--disable-checking --enable-werror" else @@ -153,7 +164,6 @@ --with-slibdir=/usr/lib \ --build=$BUILD-apple-darwin$DARWIN_VERS" -# LLVM LOCAL begin if [ "$ENABLE_LLVM" == true ]; then CONFIGFLAGS="$CONFIGFLAGS --enable-llvm=$LLVMCORE_PATH" fi @@ -191,6 +201,7 @@ cd $DIR/obj-$BUILD-$BUILD \|\| exit 1 if [ \! -f Makefile ]; then $SRC_DIR/configure $bootstrap $CONFIGFLAGS \ + $NON_ARM_CONFIGFLAGS \ --host=$BUILD-apple-darwin$DARWIN_VERS --target=$BUILD-apple-darwin$DARWIN_VERS \|\| exit 1 fi # Unset RC_DEBUG_OPTIONS because it causes the bootstrap to fail. @@ -203,12 +214,12 @@ CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" \|\| exit 1 # Add the compiler we just built to the path, giving it appropriate names. -# LLVM LOCAL Support for non /usr $DEST_ROOT +# LLVM LOCAL begin Support for non /usr $DEST_ROOT D=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin ln -f $D/llvm-gcc $D/gcc \|\| exit 1 ln -f $D/gcc $D/$BUILD-apple-darwin$DARWIN_VERS-gcc \|\| exit 1 -# LLVM LOCAL Support for non /usr $DEST_ROOT PATH=$DIR/dst-$BUILD-$BUILD$DEST_ROOT/bin:$PATH +# LLVM LOCAL end Support for non /usr $DEST_ROOT # The cross-tools' build process expects to find certain programs # under names like 'i386-apple-darwin$DARWIN_VERS-ar'; so make them. @@ -250,16 +261,19 @@ mkdir -p $DIR/obj-$BUILD-$t $DIR/dst-$BUILD-$t \|\| exit 1 cd $DIR/obj-$BUILD-$t \|\| exit 1 if [ \! -f Makefile ]; then + # APPLE LOCAL begin ARM ARM_CONFIGFLAGS $SRC_DIR/configure $CONFIGFLAGS --enable-werror-always \ + `if [ $t = 'arm' ] ; then echo $ARM_CONFIGFLAGS ; else echo $NON_ARM_CONFIGFLAGS ; fi` \ --program-prefix=$t-apple-darwin$DARWIN_VERS- \ --host=$BUILD-apple-darwin$DARWIN_VERS --target=$t-apple-darwin$DARWIN_VERS \|\| exit 1 + # APPLE LOCAL end ARM ARM_CONFIGFLAGS fi make $MAKEFLAGS all CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" \|\| exit 1 make $MAKEFLAGS DESTDIR=$DIR/dst-$BUILD-$t install-gcc install-target \ CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" \|\| exit 1 # Add the compiler we just built to the path. - # LLVM LOCAL Support for non /usr $DEST_ROOT + # LLVM LOCAL Support for non /usr $DEST_ROOT PATH=$DIR/dst-$BUILD-$t/$DEST_ROOT/bin:$PATH fi done @@ -267,7 +281,7 @@ # Rearrange various libraries, for no really good reason. for t in $CROSS_TARGETS ; do DT=$DIR/dst-$BUILD-$t - # LLVM LOCAL begin Support for non /usr $DEST_ROOT + # LLVM LOCAL Support for non /usr $DEST_ROOT D=`echo $DT/$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS` mv $D/static/libgcc.a $D/libgcc_static.a \|\| exit 1 mv $D/kext/libgcc.a $D/libcc_kext.a \|\| exit 1 @@ -293,9 +307,12 @@ fi if [ \! -f Makefile ]; then + # APPLE LOCAL begin ARM ARM_CONFIGFLAGS $SRC_DIR/configure $CONFIGFLAGS \ + `if [ $t = 'arm' ] && [ $h != 'arm' ] ; then echo $ARM_CONFIGFLAGS ; else echo $NON_ARM_CONFIGFLAGS ; fi` \ --program-prefix=$pp \ --host=$h-apple-darwin$DARWIN_VERS --target=$t-apple-darwin$DARWIN_VERS \|\| exit 1 + # APPLE LOCAL end ARM ARM_CONFIGFLAGS fi if [ $h = $t ] ; then make $MAKEFLAGS all CFLAGS="$CFLAGS" CXXFLAGS="$CFLAGS" \|\| exit 1 @@ -319,14 +336,14 @@ # Clean out DEST_DIR in case -noclean was passed to buildit. rm -rf \|\| exit 1 -# LLVM LOCAL begin - Don't install HTML docs. +# LLVM LOCAL begin Don't install HTML docs. if [ "$ENABLE_LLVM" == false ]; then # HTML documentation HTMLDIR="/Developer/Documentation/DocSets/com.apple.ADC_Reference_Library.DeveloperTools.docset/Contents/Resources/Documents/documentation/DeveloperTools" mkdir -p ".$HTMLDIR" \|\| exit 1 cp -Rp $DIR/obj-$BUILD-$BUILD/gcc/HTML/* ".$HTMLDIR/" \|\| exit 1 fi -# LLVM LOCAL end - Don't install docs. +# LLVM LOCAL end Don't install docs. # Manual pages mkdir -p .$DEST_ROOT/share \|\| exit 1 @@ -348,22 +365,26 @@ mkdir -p .$DL/$d \|\| exit 1 done for f in $LIBEXEC_FILES ; do + # LLVM LOCAL if file $DIR/dst--$t$DL/$f \| grep -q -E 'Mach-O (executable\|dynamically linked shared library)' ; then lipo -output .$DL/$f -create $DIR/dst--$t$DL/$f \|\| exit 1 else cp -p $DIR/dst-$BUILD-$t$DL/$f .$DL/$f \|\| exit 1 fi done - # LLVM LOCAL fix broken link + # LLVM LOCAL begin fix broken link ln -s ../../../../../bin/as .$DL/as ln -s ../../../../../bin/ld .$DL/ld + # LLVM LOCAL end fix broken link done # bin # The native drivers ('native' is different in different architectures). +# LLVM LOCAL begin mkdir .$DEST_ROOT/bin cpp_files=`ls $DIR/dst-$DEST_ROOT/bin/{llvm-cpp,cpp-$MAJ_VERS} 2>/dev/null` lipo -output .$DEST_ROOT/bin/llvm-cpp-$MAJ_VERS -create $cpp_files \|\| exit 1 +# LLVM LOCAL end # gcov, which is special only because it gets built multiple times and lipo # will complain if we try to add two architectures into the same output. @@ -383,14 +404,19 @@ # lib mkdir -p .$DEST_ROOT/lib/gcc \|\| exit 1 for t in $TARGETS ; do -# APPLE LOCAL LLVM build_gcc bug with non-/usr $DEST_ROOT + # LLVM LOCAL build_gcc bug with non-/usr $DEST_ROOT cp -Rp $DIR/dst-$BUILD-$t/$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS \ .$DEST_ROOT/lib/gcc \|\| exit 1 done +# APPLE LOCAL begin native compiler support +# libgomp is not built for ARM +LIBGOMP_TARGETS=`echo $TARGETS \| sed -E -e 's/(^\|[[:space:]])arm($\|[[:space:]])/ /'` +LIBGOMP_HOSTS=`echo $HOSTS \| $OMIT_X86_64 \| sed -E -e 's/(^\|[[:space:]])arm($\|[[:space:]])/ /'` + # And copy libgomp stuff by hand... -for t in $TARGETS ; do - for h in $HOSTS ; do +for t in $LIBGOMP_TARGETS ; do + for h in $LIBGOMP_HOSTS ; do if [ $h = $t ] ; then cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/libgomp.a \ .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ \|\| exit 1 @@ -398,9 +424,9 @@ .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ \|\| exit 1 if [ $h = 'powerpc' ] ; then cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgomp.a \ - .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ + .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ \|\| exit 1 cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/ppc64/libgomp.spec \ - .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ + .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/ppc64/ \|\| exit 1 elif [ $h = 'i686' ] ; then cp -p $DIR/dst-$h-$t$DEST_ROOT/lib/x86_64/libgomp.a \ .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/x86_64/ \|\| exit 1 @@ -410,12 +436,18 @@ fi done done +# APPLE LOCAL end native compiler support -# FIXME: What is the motivation here ? for t in $TARGETS ; do - cp -p /usr/lib/libstdc++.6.dylib \ - .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib \ - \|\| exit 1 + if [ "$t" == 'arm' ] ; then + cp -p $ARM_SYSROOT/usr/lib/libstdc++.6.dylib \ + .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib \ + \|\| exit 1 + else + cp -p /usr/lib/libstdc++.6.dylib \ + .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib \ + \|\| exit 1 + fi # LLVM LOCAL # strip -x -c .$DEST_ROOT/lib/gcc/$t-apple-darwin$DARWIN_VERS/$VERS/libstdc++.dylib \|\| exit 1 done @@ -446,16 +478,20 @@ # Add extra man page symlinks for 'c++' and for arch-specific names. MDIR=$DEST_DIR$DEST_ROOT/share/man/man1 +# LLVM LOCAL ln -f $MDIR/llvm-g++.1 $MDIR/llvm-c++.1 \|\| exit 1 for t in $TARGETS ; do + # LLVM LOCAL begin ln -f $MDIR/llvm-gcc.1 $MDIR/$t-apple-darwin$DARWIN_VERS-llvm-gcc.1 \ \|\| exit 1 ln -f $MDIR/llvm-g++.1 $MDIR/$t-apple-darwin$DARWIN_VERS-llvm-g++.1 \ \|\| exit 1 + # LLVM LOCAL end done # Build driver-driver using fully-named drivers for h in $HOSTS ; do + # LLVM LOCAL begin $h-apple-darwin$DARWIN_VERS-gcc \ $ORIG_SRC_DIR/driverdriver.c \ -DPDN="\"-apple-darwin$DARWIN_VERS-llvm-gcc-$MAJ_VERS\"" \ @@ -475,8 +511,10 @@ -L$DIR/dst-$BUILD-$h$DEST_ROOT/$h-apple-darwin$DARWIN_VERS/lib/ \ -L$DIR/obj-$h-$BUILD/libiberty/ \ -o $DEST_DIR/$DEST_ROOT/bin/tmp-$h-llvm-g++-$MAJ_VERS \|\| exit 1 + # LLVM LOCAL end done +# LLVM LOCAL begin lipo -output $DEST_DIR/$DEST_ROOT/bin/llvm-gcc-$MAJ_VERS -create \ $DEST_DIR/$DEST_ROOT/bin/tmp--llvm-gcc-$MAJ_VERS \|\| exit 1 @@ -487,6 +525,7 @@ rm $DEST_DIR/$DEST_ROOT/bin/tmp--llvm-gcc-$MAJ_VERS \|\| exit 1 rm $DEST_DIR/$DEST_ROOT/bin/tmp--llvm-g++-$MAJ_VERS \|\| exit 1 +# LLVM LOCAL end ######################################## # Create SYM_DIR with information required for debugging. @@ -525,7 +564,7 @@ \| xargs ranlib \|\| exit 1 fi -# APPLE LOCAL begin LLVM +# LLVM LOCAL begin # Set up the llvm-gcc/llvm-g++ symlinks. mkdir -p $DEST_DIR$LLVM_BIN_DIR cd $DEST_DIR$LLVM_BIN_DIR @@ -551,7 +590,7 @@ rm libllvmgcc.dylib ln -s ../../libllvmgcc.dylib done -# APPLE LOCAL end LLVM +# LLVM LOCAL end find $DEST_DIR -name \.dSYM -print \| xargs rm -r \|\| exit 1 chgrp -h -R wheel $DEST_DIR From clattner at apple.com Tue Aug 5 19:05:40 2008 From: clattner at apple.com (Chris Lattner) Date: Tue, 5 Aug 2008 17:05:40 -0700 Subject: [llvm-commits] [llvm] r54384 - /llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll In-Reply-To: <200808052336.m75Na2jY030027@zion.cs.uiuc.edu> References: <200808052336.m75Na2jY030027@zion.cs.uiuc.edu> Message-ID: <1D34A345-8D5D-47F8-A9C5-2E5863769C9A@apple.com> On Aug 5, 2008, at 4:36 PM, Bill Wendling wrote: > Author: void > Date: Tue Aug 5 18:36:00 2008 > New Revision: 54384 > > URL: http://llvm.org/viewvc/llvm-project?rev=54384&view=rev > Log: > Add default architecture. This won't work if the x86 backend isn't built (with configure -- enable-targets). Can the test grep the output of instcombine directly? -Chris > > > Modified: > llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll > > Modified: llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll?rev=54384&r1=54383&r2=54384&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll > (original) > +++ llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Tue > Aug 5 18:36:00 2008 > @@ -1,4 +1,4 @@ > -; RUN: llvm-as < %s \| opt -instcombine \| llc -disable-fp-elim \| not > grep orb > +; RUN: llvm-as < %s \| opt -instcombine \| llc -disable-fp-elim - > march=x86 \| not grep orb > ; PR2629 > > define void @f(i8 %x) nounwind { > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From isanbard at gmail.com Tue Aug 5 19:10:32 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 00:10:32 -0000 Subject: [llvm-commits] [llvm] r54389 - /llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Message-ID: <200808060010.m760AWQn031298@zion.cs.uiuc.edu> Author: void Date: Tue Aug 5 19:10:32 2008 New Revision: 54389 URL: http://llvm.org/viewvc/llvm-project?rev=54389&view=rev Log: Just grep for through the LL code instead of the ASM code Modified: llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Modified: llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll?rev=54389&r1=54388&r2=54389&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Tue Aug 5 19:10:32 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| opt -instcombine \| llc -disable-fp-elim -march=x86 \| not grep orb +; RUN: llvm-as < %s \| opt -instcombine \| llvm-dis \| not grep or ; PR2629 define void @f(i8* %x) nounwind { From isanbard at gmail.com Tue Aug 5 19:10:38 2008 From: isanbard at gmail.com (Bill Wendling) Date: Tue, 5 Aug 2008 17:10:38 -0700 Subject: [llvm-commits] [llvm] r54384 - /llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll In-Reply-To: <1D34A345-8D5D-47F8-A9C5-2E5863769C9A@apple.com> References: <200808052336.m75Na2jY030027@zion.cs.uiuc.edu> <1D34A345-8D5D-47F8-A9C5-2E5863769C9A@apple.com> Message-ID: <16e5fdf90808051710x368848aeqf73e78c07b36f853@mail.gmail.com> Okay. On Tue, Aug 5, 2008 at 5:05 PM, Chris Lattner wrote: > > On Aug 5, 2008, at 4:36 PM, Bill Wendling wrote: > >> Author: void >> Date: Tue Aug 5 18:36:00 2008 >> New Revision: 54384 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=54384&view=rev >> Log: >> Add default architecture. > > This won't work if the x86 backend isn't built (with configure -- > enable-targets). Can the test grep the output of instcombine directly? > > -Chris > >> >> >> Modified: >> llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll >> >> Modified: llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll >> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll?rev=54384&r1=54383&r2=54384&view=diff >> >> = >> = >> = >> = >> = >> = >> = >> = >> ====================================================================== >> --- llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll >> (original) >> +++ llvm/trunk/test/Transforms/InstCombine/2008-08-05-And.ll Tue >> Aug 5 18:36:00 2008 >> @@ -1,4 +1,4 @@ >> -; RUN: llvm-as < %s \| opt -instcombine \| llc -disable-fp-elim \| not >> grep orb >> +; RUN: llvm-as < %s \| opt -instcombine \| llc -disable-fp-elim - >> march=x86 \| not grep orb >> ; PR2629 >> >> define void @f(i8* %x) nounwind { >> >> >> _______________________________________________ >> llvm-commits mailing list >> llvm-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From dalej at apple.com Tue Aug 5 19:12:02 2008 From: dalej at apple.com (Dale Johannesen) Date: Wed, 06 Aug 2008 00:12:02 -0000 Subject: [llvm-commits] [test-suite] r54390 - /test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/pc1cod.c Message-ID: <200808060012.m760C2SM031356@zion.cs.uiuc.edu> Author: johannes Date: Tue Aug 5 19:12:01 2008 New Revision: 54390 URL: http://llvm.org/viewvc/llvm-project?rev=54390&view=rev Log: Fix source bug: write off end of array. Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/pc1cod.c Modified: test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/pc1cod.c URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/pc1cod.c?rev=54390&r1=54389&r2=54390&view=diff ============================================================================== --- test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/pc1cod.c (original) +++ test-suite/trunk/MultiSource/Benchmarks/Trimaran/enc-pc1/pc1cod.c Tue Aug 5 19:12:01 2008 @@ -260,7 +260,7 @@ /* if the user enter a key < 32 characters, characters of the default / / password will be used / - strcpy(cle, "abcdefghijklmnopqrstuvwxyz012345"); + memcpy(cle, "abcdefghijklmnopqrstuvwxyz012345", 32); printf("PC1 Cipher 256 bits \nENCRYPT file IN.BIN to OUT.BIN\n"); From evan.cheng at apple.com Tue Aug 5 20:45:19 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Wed, 06 Aug 2008 01:45:19 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54391 - /llvm-gcc-4.2/trunk/gcc/config/arm/arm.c Message-ID: <200808060145.m761jKYj001552@zion.cs.uiuc.edu> Author: evancheng Date: Tue Aug 5 20:45:18 2008 New Revision: 54391 URL: http://llvm.org/viewvc/llvm-project?rev=54391&view=rev Log: Comment out code that LLVM doesn't need to eliminate missing symbols. Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.c Modified: llvm-gcc-4.2/trunk/gcc/config/arm/arm.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config/arm/arm.c?rev=54391&r1=54390&r2=54391&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/config/arm/arm.c (original) +++ llvm-gcc-4.2/trunk/gcc/config/arm/arm.c Tue Aug 5 20:45:18 2008 @@ -84,7 +84,6 @@ static const char fp_const_from_val (REAL_VALUE_TYPE ); static arm_cc get_arm_condition_code (rtx); static HOST_WIDE_INT int_log2 (HOST_WIDE_INT); -static rtx is_jump_table (rtx); static const char output_multi_immediate (rtx , const char , const char , int, HOST_WIDE_INT); static const char shift_op (rtx, HOST_WIDE_INT ); @@ -95,6 +94,8 @@ static int handle_thumb_exit (FILE , int, bool); static int handle_thumb_pushpop (FILE , unsigned long, int, int , unsigned long, bool); /* APPLE LOCAL end compact switch tables / +/ LLVM LOCAL / +#ifndef ENABLE_LLVM static rtx is_jump_table (rtx); static HOST_WIDE_INT get_jump_table_size (rtx); static Mnode move_minipool_fix_forward_ref (Mnode , Mnode , HOST_WIDE_INT); @@ -109,8 +110,14 @@ static void push_minipool_barrier (rtx, HOST_WIDE_INT); static void push_minipool_fix (rtx, HOST_WIDE_INT, rtx , enum machine_mode, rtx); +/ LLVM LOCAL / +#endif static void arm_reorg (void); +/ LLVM LOCAL / +#ifndef ENABLE_LLVM static bool note_invalid_constants (rtx, HOST_WIDE_INT, int); +/ LLVM LOCAL / +#endif static int current_file_function_operand (rtx); static unsigned long arm_compute_save_reg0_reg12_mask (void); static unsigned long arm_compute_save_reg_mask (void); @@ -140,9 +147,13 @@ static bool arm_xscale_rtx_costs (rtx, int, int, int ); static bool arm_9e_rtx_costs (rtx, int, int, int ); static int arm_address_cost (rtx); +/ LLVM LOCAL / +#ifndef ENABLE_LLVM static bool arm_memory_load_p (rtx); static bool arm_cirrus_insn_p (rtx); static void cirrus_reorg (rtx); +/ LLVM LOCAL / +#endif static void arm_init_builtins (void); static rtx arm_expand_builtin (tree, rtx, rtx, enum machine_mode, int); static void arm_init_iwmmxt_builtins (void); @@ -432,7 +443,11 @@ #endif / APPLE LOCAL end ARM darwin local binding / / APPLE LOCAL ARM 6008578 / +/ LLVM LOCAL / +#ifndef ENABLE_LLVM static HOST_WIDE_INT get_label_pad (rtx, HOST_WIDE_INT); +/ LLVM LOCAL / +#endif / APPLE LOCAL begin ARM reliable backtraces / #undef TARGET_BUILTIN_SETJMP_FRAME_VALUE @@ -5888,6 +5903,14 @@ static int arm_adjust_cost (rtx insn, rtx link, rtx dep, int cost) { +/ LLVM LOCAL / +#ifdef ENABLE_LLVM + insn = insn; + link = link; + dep = dep; + cost = cost; + return 1; +#else rtx i_pat, d_pat; / Some true dependencies can have a higher cost depending @@ -5961,6 +5984,8 @@ } return cost; +/* LLVM LOCAL / +#endif } static int fp_consts_inited = 0; @@ -6174,6 +6199,9 @@ \|\| TREE_CODE (valtype) == COMPLEX_TYPE)); } +/ LLVM LOCAL / +#ifndef ENABLE_LLVM + / Returns TRUE if INSN is an "LDR REG, ADDR" instruction. Use by the Cirrus Maverick code which has to workaround a hardware bug triggered by such instructions. / @@ -6347,6 +6375,9 @@ } } +/ LLVM LOCAL / +#endif + / APPLE LOCAL begin ARM -mdynamic-no-pic support / / Return TRUE if X references a SYMBOL_REF. / int @@ -8354,6 +8385,9 @@ } / APPLE LOCAL end ARM 4790140 compact switch tables / +/ LLVM LOCAL / +#ifndef ENABLE_LLVM + static Mnode minipool_vector_head; static Mnode * minipool_vector_tail; static rtx minipool_vector_label; @@ -9087,6 +9121,9 @@ minipool_fix_tail = fix; } +/* LLVM LOCAL / +#endif + / Return the cost of synthesizing a 64-bit constant VAL inline. Returns the number of insns needed, or 99 if we don't know how to do it. / @@ -9219,6 +9256,9 @@ return false; } +/ LLVM LOCAL / +#ifndef ENABLE_LLVM + / Scan INSN and note any of its operands that need fixing. If DO_PUSHES is false we do not actually push any of the fixups needed. The function returns TRUE if any fixups were needed/pushed. @@ -9322,6 +9362,9 @@ } /* APPLE LOCAL end ARM 6008578 / +/ LLVM LOCAL / +#endif + / Gcc puts the pool in the wrong place for ARM, since we can only load addresses a limited distance around the pc. We do some special munging to move the constant pool values to the correct @@ -9329,6 +9372,8 @@ static void arm_reorg (void) { +/* LLVM LOCAL / +#ifndef ENABLE_LLVM rtx insn; HOST_WIDE_INT address = 0; Mfix fix; @@ -9494,6 +9539,8 @@ /* Free the minipool memory. / obstack_free (&minipool_obstack, minipool_startobj); +/ LLVM LOCAL / +#endif } / Routines to output assembly language. / @@ -12914,6 +12961,10 @@ void arm_final_prescan_insn (rtx insn) { +/ LLVM LOCAL / +#ifdef ENABLE_LLVM + insn = insn; +#else / BODY will hold the body of INSN. / rtx body = PATTERN (insn); @@ -13252,6 +13303,8 @@ call recog direct). / recog (PATTERN (insn), insn, NULL); } +/* LLVM LOCAL / +#endif } / Returns true if REGNO is a valid register @@ -14769,6 +14822,10 @@ static int thumb_far_jump_used_p (void) { +/* LLVM LOCAL / +#ifdef ENABLE_LLVM + return 0; +#else rtx insn; / This test is only important for leaf functions. / @@ -14833,6 +14890,8 @@ } return 0; +/ LLVM LOCAL / +#endif } / Return nonzero if FUNC must be entered in ARM mode. / From nicholas at mxc.ca Tue Aug 5 23:54:04 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Wed, 06 Aug 2008 04:54:04 -0000 Subject: [llvm-commits] [llvm] r54394 - in /llvm/trunk: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/2008-07-08-AndICmp.ll Message-ID: <200808060454.m764s5Vo007473@zion.cs.uiuc.edu> Author: nicholas Date: Tue Aug 5 23:54:03 2008 New Revision: 54394 URL: http://llvm.org/viewvc/llvm-project?rev=54394&view=rev Log: Reinstate this optimization, but without the miscompile. Thanks to Bill for tracking down that this was breaking llvm-gcc bootstrap on Linux. Added: llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=54394&r1=54393&r2=54394&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Tue Aug 5 23:54:03 2008 @@ -3586,6 +3586,21 @@ } } + { // (icmp ult A, C) & (icmp ult B, C) --> (icmp ult (A\|B), C) + // where C is a power of 2 + Value A, B; + ConstantInt C1, C2; + ICmpInst::Predicate LHSCC, RHSCC; + if (match(&I, m_And(m_ICmp(LHSCC, m_Value(A), m_ConstantInt(C1)), + m_ICmp(RHSCC, m_Value(B), m_ConstantInt(C2))))) + if (C1 == C2 && LHSCC == RHSCC && LHSCC == ICmpInst::ICMP_ULT && + C1->getValue().isPowerOf2()) { + Instruction NewOr = BinaryOperator::CreateOr(A, B); + InsertNewInstBefore(NewOr, I); + return new ICmpInst(LHSCC, NewOr, C1); + } + } + if (ICmpInst RHS = dyn_cast(Op1)) { // (icmp1 A, B) & (icmp2 A, B) --> (icmp3 A, B) if (Instruction R = AssociativeOpt(I, FoldICmpLogical(this, RHS))) Added: llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll?rev=54394&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll (added) +++ llvm/trunk/test/Transforms/InstCombine/2008-07-08-AndICmp.ll Tue Aug 5 23:54:03 2008 @@ -0,0 +1,10 @@ +; RUN: llvm-as < %s \| opt -instcombine \| llvm-dis \| grep icmp \| count 1 +; PR2330 + +define i1 @foo(i32 %a, i32 %b) nounwind { +entry: + icmp ult i32 %a, 8 ; :0 [#uses=1] + icmp ult i32 %b, 8 ; :1 [#uses=1] + and i1 %1, %0 ; :2 [#uses=1] + ret i1 %2 +} From sabre at nondot.org Wed Aug 6 00:13:06 2008 From: sabre at nondot.org (Chris Lattner) Date: Wed, 06 Aug 2008 05:13:06 -0000 Subject: [llvm-commits] [llvm] r54396 - in /llvm/trunk: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/sitofp.ll Message-ID: <200808060513.m765D6TG008003@zion.cs.uiuc.edu> Author: lattner Date: Wed Aug 6 00:13:06 2008 New Revision: 54396 URL: http://llvm.org/viewvc/llvm-project?rev=54396&view=rev Log: Zap sitofp/fptoui pairs. In all cases when the sign difference matters, the result is undefined anyway. Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp llvm/trunk/test/Transforms/InstCombine/sitofp.ll Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=54396&r1=54395&r2=54396&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Wed Aug 6 00:13:06 2008 @@ -7750,27 +7750,41 @@ } Instruction InstCombiner::visitFPToUI(FPToUIInst &FI) { - // fptoui(uitofp(X)) --> X if the intermediate type has enough bits in its - // mantissa to accurately represent all values of X. For example, do not - // do this with i64->float->i64. - if (UIToFPInst SrcI = dyn_cast(FI.getOperand(0))) - if (SrcI->getOperand(0)->getType() == FI.getType() && - (int)FI.getType()->getPrimitiveSizeInBits() < /extra bit for sign / - SrcI->getType()->getFPMantissaWidth()) - return ReplaceInstUsesWith(FI, SrcI->getOperand(0)); + Instruction OpI = dyn_cast(FI.getOperand(0)); + if (OpI == 0) + return commonCastTransforms(FI); + + // fptoui(uitofp(X)) --> X + // fptoui(sitofp(X)) --> X + // This is safe if the intermediate type has enough bits in its mantissa to + // accurately represent all values of X. For example, do not do this with + // i64->float->i64. This is also safe for sitofp case, because any negative + // 'X' value would cause an undefined result for the fptoui. + if ((isa(OpI) \|\| isa(OpI)) && + OpI->getOperand(0)->getType() == FI.getType() && + (int)FI.getType()->getPrimitiveSizeInBits() < /extra bit for sign / + OpI->getType()->getFPMantissaWidth()) + return ReplaceInstUsesWith(FI, OpI->getOperand(0)); return commonCastTransforms(FI); } Instruction InstCombiner::visitFPToSI(FPToSIInst &FI) { - // fptosi(sitofp(X)) --> X if the intermediate type has enough bits in its - // mantissa to accurately represent all values of X. For example, do not - // do this with i64->float->i64. - if (SIToFPInst SrcI = dyn_cast(FI.getOperand(0))) - if (SrcI->getOperand(0)->getType() == FI.getType() && - (int)FI.getType()->getPrimitiveSizeInBits() <= - SrcI->getType()->getFPMantissaWidth()) - return ReplaceInstUsesWith(FI, SrcI->getOperand(0)); + Instruction OpI = dyn_cast(FI.getOperand(0)); + if (OpI == 0) + return commonCastTransforms(FI); + + // fptosi(sitofp(X)) --> X + // fptosi(uitofp(X)) --> X + // This is safe if the intermediate type has enough bits in its mantissa to + // accurately represent all values of X. For example, do not do this with + // i64->float->i64. This is also safe for sitofp case, because any negative + // 'X' value would cause an undefined result for the fptoui. + if ((isa(OpI) \|\| isa(OpI)) && + OpI->getOperand(0)->getType() == FI.getType() && + (int)FI.getType()->getPrimitiveSizeInBits() <= + OpI->getType()->getFPMantissaWidth()) + return ReplaceInstUsesWith(FI, OpI->getOperand(0)); return commonCastTransforms(FI); } Modified: llvm/trunk/test/Transforms/InstCombine/sitofp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/sitofp.ll?rev=54396&r1=54395&r2=54396&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/sitofp.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/sitofp.ll Wed Aug 6 00:13:06 2008 @@ -1,4 +1,4 @@ -; RUN: llvm-as < %s \| opt -instcombine \| llvm-dis \| not grep sitofp +; RUN: llvm-as < %s \| opt -instcombine \| llvm-dis \| not grep itofp define i1 @test1(i8 %A) { %B = sitofp i8 %A to double @@ -41,3 +41,15 @@ ret i32 %G } +define i32 @test7(i32 %a) nounwind { + %b = sitofp i32 %a to double ; [#uses=1] + %c = fptoui double %b to i32 ; [#uses=1] + ret i32 %c +} + +define i32 @test8(i32 %a) nounwind { + %b = uitofp i32 %a to double ; [#uses=1] + %c = fptosi double %b to i32 ; [#uses=1] + ret i32 %c +} + From sabre at nondot.org Wed Aug 6 00:57:00 2008 From: sabre at nondot.org (Chris Lattner) Date: Wed, 06 Aug 2008 05:57:00 -0000 Subject: [llvm-commits] [llvm] r54398 - in /llvm/trunk/docs/CommandGuide: index.html stkrc.pod Message-ID: <200808060557.m765v1EX009259@zion.cs.uiuc.edu> Author: lattner Date: Wed Aug 6 00:56:52 2008 New Revision: 54398 URL: http://llvm.org/viewvc/llvm-project?rev=54398&view=rev Log: remove stacker Removed: llvm/trunk/docs/CommandGuide/stkrc.pod Modified: llvm/trunk/docs/CommandGuide/index.html Modified: llvm/trunk/docs/CommandGuide/index.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/index.html?rev=54398&r1=54397&r2=54398&view=diff ============================================================================== --- llvm/trunk/docs/CommandGuide/index.html (original) +++ llvm/trunk/docs/CommandGuide/index.html Wed Aug 6 00:56:52 2008 @@ -82,16 +82,12 @@ - llvmgcc* - + llvm-gcc - GCC-based C front-end for LLVM - llvmg++ - + llvm-g++ - GCC-based C++ front-end for LLVM - stkrc - - front-end compiler for the Stacker - language - Removed: llvm/trunk/docs/CommandGuide/stkrc.pod URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/stkrc.pod?rev=54397&view=auto ============================================================================== --- llvm/trunk/docs/CommandGuide/stkrc.pod (original) +++ llvm/trunk/docs/CommandGuide/stkrc.pod (removed) @@ -1,96 +0,0 @@ -=pod - -=head1 NAME - -stkrc - Stacker Compiler - -=head1 SYNOPSIS - -B [I] [I] - -=head1 DESCRIPTION - -The B command is the compiler for the Stacker language. Stacker is a -simple stack based, Forth-like language that was written as a demonstration -language for LLVM. For details on the language, please see -L . The B compiler is fairly -minimal. It compiles to bitcode only and doesn't perform any optimizations. -The output of stkrc (a bitcode file) can be piped through other LLVM tools -for optimization and linking. - -If F is omitted or is C<->, then B reads its input -from standard input. This is useful for combining the tool into a pipeline. - -If an output file is not specified with the B<-o> option, then -B sends its output to a file or standard output by following -these rules: - -=over - -=item * - -If the input is standard input, then the output is standard output. - -=item * - -If the input is a file that ends with C<.st>, then the output file is of -the same name, except that the suffix is changed to C<.bc>. - -=item * - -If the input is a file that does not end with the C<.st> suffix, then the -output file has the same name as the input file, except that the C<.bc> -suffix is appended. - -=back - -=head1 OPTIONS - -=over - -=item B<-o> F - -Specify the output file name. If F is C<->, then B -sends its output to standard output. - -=item B<-stats> - -Print statistics acquired during compilation. - -=item B<-time-passes> - -Record the amount of time needed for each pass and print it to standard -error. - -=item B<-f> - -Force the output to be written. Normally, B won't overwrite an existing -bitcode file. This option overrides that behavior. - -=item B<-s> F - -Specify the stack size for the program. The default stack size, 1024, should be -sufficient for most programs. For very large programs, especially those that -recurse a lot, you might want to provide a larger value. Each unit of this -value consumes 8 bytes of memory. - -=item B<-help> - -Print a summary of command line options. - -=back - -=head1 EXIT STATUS - -If B succeeds, it will exit with 0. Otherwise, if an error -occurs, it will exit with a non-zero value, usually 1. - -=head1 SEE ALSO - -L, L - -=head1 AUTHORS - -Maintained by the LLVM Team (L). - -=cut From isanbard at gmail.com Wed Aug 6 00:57:28 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 05:57:28 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54399 - in /llvm-gcc-4.2/trunk/gcc/testsuite: g++.apple/block-blocks-test-2.C g++.apple/block-blocks-test-3.C gcc.apple/block-blocks-test-1.c gcc.apple/block-blocks-test-2.c gcc.apple/block-blocks-test-3.c gcc.apple/block-blocks-test-4.c gcc.apple/block-blocks-test-5.c gcc.apple/block-blocks-test-6.c gcc.apple/block-blocks-test-7.c gcc.apple/block-blocks-test-8.c Message-ID: <200808060557.m765vTM1009298@zion.cs.uiuc.edu> Author: void Date: Wed Aug 6 00:57:28 2008 New Revision: 54399 URL: http://llvm.org/viewvc/llvm-project?rev=54399&view=rev Log: Adding blocks tests from Apple GCC mainline Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-2.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-3.C llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-2.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-3.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-4.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-5.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-6.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-7.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-8.c Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-2.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/block-blocks-test-2.C?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-2.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-2.C Wed Aug 6 00:57:28 2008 @@ -0,0 +1,19 @@ +/* APPLE LOCAL file 5932809 / +/ { dg-options "-fblocks" } / +/ { dg-do run } / + +#include + +int main() { + __byref int X = 1234; + __byref const char message = "HELLO"; + + X = X - 1234; + + X += 1; + + printf ("%s(%d)\n", message, X); + X -= 1; + + return X; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-3.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/block-blocks-test-3.C?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-3.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/block-blocks-test-3.C Wed Aug 6 00:57:28 2008 @@ -0,0 +1,15 @@ +/* APPLE LOCAL file 5932809 / +/ { dg-options "-fblocks" } / +/ { dg-do run } / + +#include + +int main() { + __byref int X = 1234; + __byref const char message = "HELLO\n"; + + X = X - 1234; + + printf ("%s\n", message); + return X; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-1.c?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-1.c Wed Aug 6 00:57:28 2008 @@ -0,0 +1,15 @@ +/* APPLE LOCAL file 5932809 / +/ { dg-options "-fblocks" } / +/ { dg-do compile } / + +__byref int X; / { dg-warning "__byref attribute is only allowed on local variables - ignored" } / + +int foo(__byref int param) { / { dg-warning "byref attribute can be specified on variables only - ignored" } / + __byref int OK = 1; + + extern __byref double extern_var; / { dg-warning "__byref attribute is only allowed on local variables - ignored" } / + if (X) { + static __byref char pch; /* { dg-warning "__byref attribute is only allowed on local variables - ignored" } / + } + return OK - 1; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-2.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-2.c?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-2.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-2.c Wed Aug 6 00:57:28 2008 @@ -0,0 +1,20 @@ +/ APPLE LOCAL file 5932809 / +/ { dg-options "-fblocks" } / +/ { dg-do run } / + +#include +void _Block_byref_release(voidsrc){} + +int main() { + __byref int X = 1234; + __byref const char * message = "HELLO"; + + X = X - 1234; + + X += 1; + + printf ("%s(%d)\n", message, X); + X -= 1; + + return X; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-3.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-3.c?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-3.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-3.c Wed Aug 6 00:57:28 2008 @@ -0,0 +1,16 @@ +/* APPLE LOCAL file 5932809 / +/ { dg-options "-fblocks" } / +/ { dg-do run } / + +#include +void _Block_byref_release(voidsrc){} + +int main() { + __byref int X = 1234; + __byref const char * message = "HELLO\n"; + + X = X - 1234; + + printf ("%s\n", message); + return X; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-4.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-4.c?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-4.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-4.c Wed Aug 6 00:57:28 2008 @@ -0,0 +1,17 @@ +/* APPLE LOCAL file 5932809 / +/ { dg-options "-fblocks" } / +/ { dg-do run } / + +#include +void _NSConcreteStackBlock; +void _Block_byref_assign_copy(void * dst, void src){} +void _Block_byref_release(voidsrc){} + +int main() { + __byref int X = 1234; + + int (^CP)(void) = ^{ \|X\| X = X+1; return X; }; /* { dg-warning "has been deprecated in blocks" } / + CP(); + printf ("X = %d\n", X); + return X - 1235; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-5.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-5.c?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-5.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-5.c Wed Aug 6 00:57:28 2008 @@ -0,0 +1,38 @@ +/ APPLE LOCAL file 5932809 / +/ { dg-options "-fblocks" } / +/ { dg-do run } / + +#include +void _NSConcreteStackBlock; +void _Block_byref_assign_copy(void * dst, void src){} +void _Block_byref_release(voidsrc){} +extern void exit(int); + +typedef double (^myblock)(int); + + +double test(myblock I) { + return I(42); +} + +int main() { + int x = 1; + __byref int y = 2; + __byref br_x; + int y1; + double res = test(^(int z){\|y\| y = x+z; return (double)x; }); /* { dg-warning "has been deprecated in blocks" } / + printf("result = %f x = %d y = %d\n", res, x, y); + if (x != 1 \|\| y != 43) + exit(1); + + br_x = x; + y1 = y; + + res = test(^(int z){\|br_x\| br_x = br_x+z; return (double)y1; }); / { dg-warning "has been deprecated in blocks" } / + printf("result = %f br_x = %d y1 = %d\n", res, br_x, y1); + if (br_x != 43 \|\| y1 != 43) + exit(1); + + return 0; +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-6.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-6.c?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-6.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-6.c Wed Aug 6 00:57:28 2008 @@ -0,0 +1,32 @@ +/ APPLE LOCAL file 5932809 / +/ { dg-options "-fblocks" } / +/ { dg-do run } / + +#include +void _NSConcreteStackBlock; +void _Block_byref_assign_copy(void * dst, void src){} +void _Block_byref_release(voidsrc){} +extern void exit(int); + +typedef double (^myblock)(int); + + +double test(myblock I) { + return I(42); +} + +int main() { + __byref int x = 1; + __byref int y = 2; + double res = test(^(int z){\|y\| y = x+z; return (double)x; }); /* { dg-warning "has been deprecated in blocks" } / + printf("result = %f x = %d y = %d\n", res, x, y); + if (x != 1 \|\| y != 43) + exit(1); + + res = test(^(int z){\|x\| x = x+z; return (double)y; }); / { dg-warning "has been deprecated in blocks" } / + printf("result = %f x = %d y = %d\n", res, x, y); + if (x != 43 \|\| y != 43) + exit(1); + return 0; +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-7.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-7.c?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-7.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-7.c Wed Aug 6 00:57:28 2008 @@ -0,0 +1,41 @@ +/ APPLE LOCAL file radar 5932809 / +/ { dg-do run } / +/ { dg-options "-mmacosx-version-min=10.5 -ObjC -lobjc" { target --darwin* } } / + +#include + +void _NSConcreteStackBlock; +void _Block_byref_assign_copy(void * dst, void src){} +void _Block_byref_release(voidsrc){} + + +int i; + +int foo() { + __byref id FFFFFF; + __byref id Q; + ^{ \|FFFFFF\| FFFFFF = 0; }; /* { dg-warning "has been deprecated in blocks" } / + + if (i) + { + __byref id FFFFFF; + __byref id Q; + ^{ \|FFFFFF\| FFFFFF = 0; }; / { dg-warning "has been deprecated in blocks" } / + } +} + +int main() { + __byref id X; + __byref id X1; + ^{ \|X\| X = 0; }; / { dg-warning "has been deprecated in blocks" } / + + if (i) + { + __byref id X; + __byref id X1; + ^{ \|X\| X = 0; }; / { dg-warning "has been deprecated in blocks" } / + } + return 0; +} + + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-8.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-8.c?rev=54399&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-8.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/block-blocks-test-8.c Wed Aug 6 00:57:28 2008 @@ -0,0 +1,123 @@ +/ APPLE LOCAL file radar 5932809 / +/ Test the __byreg runtime features. / +/ { dg-options "-mmacosx-version-min=10.5 -ObjC -framework Foundation" { target i?86--darwin } } / +/ { dg-do run { target i?86--darwin } } / +/ { dg-skip-if "" { --darwin* } { "-m64" } { "" } } / + +#import + +void _NSConcreteStackBlock; + +int CalledRetain = 0; + +id objc_msgSend(id target, SEL cmd) { + printf("[%p %s] called\n", target, sel_getName(cmd)); + if (!strcmp(sel_getName(cmd), "retain")) { + CalledRetain = 1; + } + return target; +} + + at interface DumbObject { + at public + id isa; +} + at end +id newDumbObject() { + DumbObject result = (DumbObject )calloc(sizeof(DumbObject), 1); + result->isa = objc_getClass("DumbObject"); + return result; +} + + at implementation DumbObject ++ new { + return newDumbObject(); +} ++ (void) initialize { } +- forward:(SEL)msg :(long )params { + printf("forward:: with %s called\n", sel_getName(msg)); + return self; +} + at end + +//#include + +enum { + BLOCK_NEEDS_FREE = (1 << 24), + BLOCK_HAS_COPY_DISPOSE = (1 << 25), + BLOCK_NO_COPY = (1 << 26), // interim byref: no copies allowed + BLOCK_IS_GC = (1 << 27), +}; + +struct Block_basic { + void isa; + int Block_flags; // int32_t + int Block_size; // XXX should be packed into Block_flags + void (Block_invoke)(void ); + void (Block_copy)(void dst, void src); + void (Block_dispose)(void ); + //long params[0]; // generic space for const & byref hidden params, return value, variable on needs of course +}; +struct Block_byref { + //long reserved; + struct Block_byref forwarding; + int flags;//refcount; + int size; + void (byref_keep)(struct Block_byref dst, struct Block_byref src); + void (byref_destroy)(struct Block_byref ); + // long shared[0]; +}; + + +int ByrefAssignCopy = 0; + +void _Block_byref_assign_copy(void destp, void source) { + struct Block_byref src = (struct Block_byref )source; + ByrefAssignCopy = 1; + // lets look at the Block_byref + if ((src->flags & BLOCK_HAS_COPY_DISPOSE) == 0) { + printf("byref data block does not have bit saying that copy/dispose helper routines are present\n"); + return; + } + printf("calling out to byref copy helper at %p\n", src->byref_keep); + int junk[100]; + src->byref_keep((struct Block_byref )junk, src); +} + +void _Block_byref_release(void source) { + struct Block_byref src = source; + src->byref_destroy(src); +} + +int main(int argc, char argv[]) { + id __byref dumbo = newDumbObject(); //[DumbObject new]; + void (^dummy)(void) = ^{ \| dumbo \| / { dg-warning "has been deprecated in blocks" } / + [dumbo self]; + }; + + struct Block_basic aBlock = (struct Block_basic )(void )dummy; + if ((aBlock->Block_flags & BLOCK_HAS_COPY_DISPOSE) == 0) { + printf("Block should have a NON_POD copy/destroy helpers and flags to say so, but doesn't\n"); + return 1; + } + + char result[200]; + printf("calling out to copy support helper at %p\n", aBlock->Block_copy); + (aBlock->Block_copy)(result, aBlock); // do fixup + + // The copy/destroy helper should have had a callout to _Block_byref_assign_copy for its byref block + if (! ByrefAssignCopy) { + printf("_Block_copy_assign not called\n"); + return 1; + } + + // the copy/destroy helper of the byref should have done dst->object = [src->object retain] + if (! CalledRetain) { + printf("byref block support helper did not call retain\n"); + return 1; + } + + (aBlock->Block_dispose)(aBlock); + + return 0; +} From sabre at nondot.org Wed Aug 6 00:57:58 2008 From: sabre at nondot.org (Chris Lattner) Date: Wed, 06 Aug 2008 05:57:58 -0000 Subject: [llvm-commits] [llvm] r54400 - /llvm/trunk/docs/CommandGuide/index.html Message-ID: <200808060557.m765vwGU009324@zion.cs.uiuc.edu> Author: lattner Date: Wed Aug 6 00:57:58 2008 New Revision: 54400 URL: http://llvm.org/viewvc/llvm-project?rev=54400&view=rev Log: stacker is really gone. Modified: llvm/trunk/docs/CommandGuide/index.html Modified: llvm/trunk/docs/CommandGuide/index.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/CommandGuide/index.html?rev=54400&r1=54399&r2=54400&view=diff ============================================================================== --- llvm/trunk/docs/CommandGuide/index.html (original) +++ llvm/trunk/docs/CommandGuide/index.html Wed Aug 6 00:57:58 2008 @@ -75,7 +75,7 @@ - C, C++, and Stacker Front-end Commands + C and C++ Front-end Commands From isanbard at gmail.com Wed Aug 6 01:11:33 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 06:11:33 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54401 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2061/ Message-ID: <200808060611.m766BXKx009706@zion.cs.uiuc.edu> Author: void Date: Wed Aug 6 01:11:32 2008 New Revision: 54401 URL: http://llvm.org/viewvc/llvm-project?rev=54401&view=rev Log: Creating llvmgcc42-2061 tag from llvmgcc42-2057 Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2061/ - copied from r54400, llvm-gcc-4.2/tags/Apple/llvmgcc42-2057/ From isanbard at gmail.com Wed Aug 6 01:12:36 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 06:12:36 -0000 Subject: [llvm-commits] [llvm] r54402 - /llvm/tags/Apple/llvmCore-2061/ Message-ID: <200808060612.m766CaIq009738@zion.cs.uiuc.edu> Author: void Date: Wed Aug 6 01:12:36 2008 New Revision: 54402 URL: http://llvm.org/viewvc/llvm-project?rev=54402&view=rev Log: Creating llvmCore-2061 tag from llvmCore-2057 Added: llvm/tags/Apple/llvmCore-2061/ - copied from r54401, llvm/tags/Apple/llvmCore-2057/ From bruno.cardoso at gmail.com Wed Aug 6 01:14:43 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Wed, 06 Aug 2008 06:14:43 -0000 Subject: [llvm-commits] [llvm] r54403 - in /llvm/trunk/lib/Target/Mips: MipsAsmPrinter.cpp MipsInstrInfo.td MipsMachineFunction.h MipsRegisterInfo.cpp MipsRegisterInfo.h MipsTargetMachine.cpp Message-ID: <200808060614.m766EhvK009814@zion.cs.uiuc.edu> Author: bruno Date: Wed Aug 6 01:14:43 2008 New Revision: 54403 URL: http://llvm.org/viewvc/llvm-project?rev=54403&view=rev Log: Added support for fp callee saved registers. Added fp register clobbering during calls. Added AsmPrinter support for "fmask", a bitmask that indicates where on the stack the fp callee saved registers are. Fixed the stack frame layout for Mips, now the callee saved regs are in the right stack location (a little documentation about how this stack frame must look like is present in MipsRegisterInfo.cpp). This was done using the method MipsRegisterInfo::adjustMipsStackFrame To be more clear, these are examples of what is solves : 1) FP and RA are also callee saved, and despite they aren't in CSI they must be saved before the fp callee saved registers. 2) The ABI requires that local varibles are allocated before the callee saved register area, the opposite behavior from the default allocation. 3) CPU and FPU saved register area must be aligned independent of each other. Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp llvm/trunk/lib/Target/Mips/MipsInstrInfo.td llvm/trunk/lib/Target/Mips/MipsMachineFunction.h llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp?rev=54403&r1=54402&r2=54403&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp Wed Aug 6 01:14:43 2008 @@ -67,15 +67,13 @@ void printFCCOperand(const MachineInstr MI, int opNum, const char Modifier = 0); void printModuleLevelGV(const GlobalVariable* GVar); - unsigned int getSavedRegsBitmask(bool isFloat, MachineFunction &MF); + void printSavedRegsBitmask(MachineFunction &MF); void printHex32(unsigned int Value); const char emitCurrentABIString(void); void emitFunctionStart(MachineFunction &MF); void emitFunctionEnd(MachineFunction &MF); void emitFrameDirective(MachineFunction &MF); - void emitMaskDirective(MachineFunction &MF); - void emitFMaskDirective(MachineFunction &MF); bool printInstruction(const MachineInstr MI); // autogenerated. bool runOnMachineFunction(MachineFunction &F); @@ -131,69 +129,45 @@ // Mask directives //===----------------------------------------------------------------------===// -/// Mask directive for GPR +// Create a bitmask with all callee saved registers for CPU or Floating Point +// registers. For CPU registers consider RA, GP and FP for saving if necessary. void MipsAsmPrinter:: -emitMaskDirective(MachineFunction &MF) -{ - MipsFunctionInfo MipsFI = MF.getInfo(); - - int StackSize = MF.getFrameInfo()->getStackSize(); - int Offset = (!MipsFI->getTopSavedRegOffset()) ? 0 : - (-(StackSize-MipsFI->getTopSavedRegOffset())); - - #ifndef NDEBUG - DOUT << "--> emitMaskDirective" << '\n'; - DOUT << "StackSize : " << StackSize << '\n'; - DOUT << "getTopSavedReg : " << MipsFI->getTopSavedRegOffset() << '\n'; - DOUT << "Offset : " << Offset << "\n\n"; - #endif - - unsigned int Bitmask = getSavedRegsBitmask(false, MF); - O << "\t.mask \t"; - printHex32(Bitmask); - O << ',' << Offset << '\n'; -} - -/// TODO: Mask Directive for Floating Point -void MipsAsmPrinter:: -emitFMaskDirective(MachineFunction &MF) -{ - unsigned int Bitmask = getSavedRegsBitmask(true, MF); - - O << "\t.fmask\t"; - printHex32(Bitmask); - O << ",0" << '\n'; -} - -// Create a bitmask with all callee saved registers for CPU -// or Floating Point registers. For CPU registers consider RA, -// GP and FP for saving if necessary. -unsigned int MipsAsmPrinter:: -getSavedRegsBitmask(bool isFloat, MachineFunction &MF) +printSavedRegsBitmask(MachineFunction &MF) { const TargetRegisterInfo &RI = TM.getRegisterInfo(); + MipsFunctionInfo MipsFI = MF.getInfo(); - // Floating Point Registers, TODO - if (isFloat) - return 0; - - // CPU Registers - unsigned int Bitmask = 0; + // CPU and FPU Saved Registers Bitmasks + unsigned int CPUBitmask = 0; + unsigned int FPUBitmask = 0; + // Set the CPU and FPU Bitmasks MachineFrameInfo MFI = MF.getFrameInfo(); const std::vector &CSI = MFI->getCalleeSavedInfo(); - for (unsigned i = 0, e = CSI.size(); i != e; ++i) - Bitmask \|= (1 << MipsRegisterInfo::getRegisterNumbering(CSI[i].getReg())); + for (unsigned i = 0, e = CSI.size(); i != e; ++i) { + unsigned RegNum = MipsRegisterInfo::getRegisterNumbering(CSI[i].getReg()); + if (CSI[i].getRegClass() == Mips::CPURegsRegisterClass) + CPUBitmask \|= (1 << RegNum); + else + FPUBitmask \|= (1 << RegNum); + } + // Return Address and Frame registers must also be set in CPUBitmask. if (RI.hasFP(MF)) - Bitmask \|= (1 << MipsRegisterInfo:: + CPUBitmask \|= (1 << MipsRegisterInfo:: getRegisterNumbering(RI.getFrameRegister(MF))); if (MF.getFrameInfo()->hasCalls()) - Bitmask \|= (1 << MipsRegisterInfo:: + CPUBitmask \|= (1 << MipsRegisterInfo:: getRegisterNumbering(RI.getRARegister())); - return Bitmask; + // Print CPUBitmask + O << "\t.mask \t"; printHex32(CPUBitmask); O << ',' + << MipsFI->getCPUTopSavedRegOff() << '\n'; + + // Print FPUBitmask + O << "\t.fmask\t"; printHex32(FPUBitmask); O << "," + << MipsFI->getFPUTopSavedRegOff() << '\n'; } // Print a 32 bit hex number with all numbers. @@ -269,8 +243,7 @@ O << CurrentFnName << ":\n"; emitFrameDirective(MF); - emitMaskDirective(MF); - emitFMaskDirective(MF); + printSavedRegsBitmask(MF); O << '\n'; } Modified: llvm/trunk/lib/Target/Mips/MipsInstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrInfo.td?rev=54403&r1=54402&r2=54403&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsInstrInfo.td (original) +++ llvm/trunk/lib/Target/Mips/MipsInstrInfo.td Wed Aug 6 01:14:43 2008 @@ -279,8 +279,9 @@ // Jump and Link (Call) let isCall=1, hasDelaySlot=1, // All calls clobber the non-callee saved registers... - Defs = [AT, V0, V1, A0, A1, A2, A3, T0, T1, T2, - T3, T4, T5, T6, T7, T8, T9, K0, K1], Uses = [GP] in { + Defs = [AT, V0, V1, A0, A1, A2, A3, T0, T1, T2, T3, T4, T5, T6, T7, T8, T9, + K0, K1, F0, F1, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12, F13, + F14, F15, F16, F17, F18, F19], Uses = [GP] in { class JumpLink op, string instr_asm>: FJ< op, (outs), Modified: llvm/trunk/lib/Target/Mips/MipsMachineFunction.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsMachineFunction.h?rev=54403&r1=54402&r2=54403&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsMachineFunction.h (original) +++ llvm/trunk/lib/Target/Mips/MipsMachineFunction.h Wed Aug 6 01:14:43 2008 @@ -26,13 +26,20 @@ private: /// Holds for each function where on the stack the Frame Pointer must be - /// saved. + /// saved. This is used on Prologue and Epilogue to emit FP save/restore int FPStackOffset; /// Holds for each function where on the stack the Return Address must be - /// saved. + /// saved. This is used on Prologue and Epilogue to emit RA save/restore int RAStackOffset; + /// At each function entry, two special bitmask directives must be emitted + /// to help debugging, for CPU and FPU callee saved registers. Both need + /// the negative offset from the final stack size and its higher registers + /// location on the stack. + int CPUTopSavedRegOff; + int FPUTopSavedRegOff; + /// MipsFIHolder - Holds a FrameIndex and it's Stack Pointer Offset struct MipsFIHolder { @@ -49,9 +56,9 @@ /// to be used on emitPrologue and processFunctionBeforeFrameFinalized. MipsFIHolder GPHolder; - // On LowerFORMAL_ARGUMENTS the stack size is unknown, so the Stack - // Pointer Offset calculation of "not in register arguments" must be - // postponed to emitPrologue. + /// On LowerFORMAL_ARGUMENTS the stack size is unknown, so the Stack + /// Pointer Offset calculation of "not in register arguments" must be + /// postponed to emitPrologue. SmallVector FnLoadArgs; bool HasLoadArgs; @@ -69,7 +76,8 @@ public: MipsFunctionInfo(MachineFunction& MF) - : FPStackOffset(0), RAStackOffset(0), GPHolder(-1,-1), HasLoadArgs(false), + : FPStackOffset(0), RAStackOffset(0), CPUTopSavedRegOff(0), + FPUTopSavedRegOff(0), GPHolder(-1,-1), HasLoadArgs(false), HasStoreVarArgs(false), SRetReturnReg(0) {} @@ -79,16 +87,17 @@ int getRAStackOffset() const { return RAStackOffset; } void setRAStackOffset(int Off) { RAStackOffset = Off; } + int getCPUTopSavedRegOff() const { return CPUTopSavedRegOff; } + void setCPUTopSavedRegOff(int Off) { CPUTopSavedRegOff = Off; } + + int getFPUTopSavedRegOff() const { return FPUTopSavedRegOff; } + void setFPUTopSavedRegOff(int Off) { FPUTopSavedRegOff = Off; } + int getGPStackOffset() const { return GPHolder.SPOffset; } int getGPFI() const { return GPHolder.FI; } void setGPStackOffset(int Off) { GPHolder.SPOffset = Off; } void setGPFI(int FI) { GPHolder.FI = FI; } - int getTopSavedRegOffset() const { - return (RAStackOffset > FPStackOffset) ? - (RAStackOffset) : (FPStackOffset); - } - bool hasLoadArgs() const { return HasLoadArgs; } bool hasStoreVarArgs() const { return HasStoreVarArgs; } Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp?rev=54403&r1=54402&r2=54403&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp Wed Aug 6 01:14:43 2008 @@ -47,37 +47,37 @@ getRegisterNumbering(unsigned RegEnum) { switch (RegEnum) { - case Mips::ZERO : case Mips::F0 : return 0; + case Mips::ZERO : case Mips::F0 : case Mips::D0 : return 0; case Mips::AT : case Mips::F1 : return 1; - case Mips::V0 : case Mips::F2 : return 2; + case Mips::V0 : case Mips::F2 : case Mips::D1 : return 2; case Mips::V1 : case Mips::F3 : return 3; - case Mips::A0 : case Mips::F4 : return 4; + case Mips::A0 : case Mips::F4 : case Mips::D2 : return 4; case Mips::A1 : case Mips::F5 : return 5; - case Mips::A2 : case Mips::F6 : return 6; + case Mips::A2 : case Mips::F6 : case Mips::D3 : return 6; case Mips::A3 : case Mips::F7 : return 7; - case Mips::T0 : case Mips::F8 : return 8; + case Mips::T0 : case Mips::F8 : case Mips::D4 : return 8; case Mips::T1 : case Mips::F9 : return 9; - case Mips::T2 : case Mips::F10: return 10; + case Mips::T2 : case Mips::F10: case Mips::D5: return 10; case Mips::T3 : case Mips::F11: return 11; - case Mips::T4 : case Mips::F12: return 12; + case Mips::T4 : case Mips::F12: case Mips::D6: return 12; case Mips::T5 : case Mips::F13: return 13; - case Mips::T6 : case Mips::F14: return 14; + case Mips::T6 : case Mips::F14: case Mips::D7: return 14; case Mips::T7 : case Mips::F15: return 15; - case Mips::T8 : case Mips::F16: return 16; + case Mips::T8 : case Mips::F16: case Mips::D8: return 16; case Mips::T9 : case Mips::F17: return 17; - case Mips::S0 : case Mips::F18: return 18; + case Mips::S0 : case Mips::F18: case Mips::D9: return 18; case Mips::S1 : case Mips::F19: return 19; - case Mips::S2 : case Mips::F20: return 20; + case Mips::S2 : case Mips::F20: case Mips::D10: return 20; case Mips::S3 : case Mips::F21: return 21; - case Mips::S4 : case Mips::F22: return 22; + case Mips::S4 : case Mips::F22: case Mips::D11: return 22; case Mips::S5 : case Mips::F23: return 23; - case Mips::S6 : case Mips::F24: return 24; + case Mips::S6 : case Mips::F24: case Mips::D12: return 24; case Mips::S7 : case Mips::F25: return 25; - case Mips::K0 : case Mips::F26: return 26; + case Mips::K0 : case Mips::F26: case Mips::D13: return 26; case Mips::K1 : case Mips::F27: return 27; - case Mips::GP : case Mips::F28: return 28; + case Mips::GP : case Mips::F28: case Mips::D14: return 28; case Mips::SP : case Mips::F29: return 29; - case Mips::FP : case Mips::F30: return 30; + case Mips::FP : case Mips::F30: case Mips::D15: return 30; case Mips::RA : case Mips::F31: return 31; default: assert(0 && "Unknown register number!"); } @@ -94,26 +94,55 @@ const unsigned* MipsRegisterInfo:: getCalleeSavedRegs(const MachineFunction MF) const { - // Mips callee-save register range is $16-$23(s0-s7) - static const unsigned CalleeSavedRegs[] = { + // Mips callee-save register range is $16-$23, $f20-$f30 + static const unsigned SingleFloatOnlyCalleeSavedRegs[] = { Mips::S0, Mips::S1, Mips::S2, Mips::S3, - Mips::S4, Mips::S5, Mips::S6, Mips::S7, 0 + Mips::S4, Mips::S5, Mips::S6, Mips::S7, + Mips::F20, Mips::F21, Mips::F22, Mips::F23, Mips::F24, Mips::F25, + Mips::F26, Mips::F27, Mips::F28, Mips::F29, Mips::F30, 0 }; - return CalleeSavedRegs; + static const unsigned BitMode32CalleeSavedRegs[] = { + Mips::S0, Mips::S1, Mips::S2, Mips::S3, + Mips::S4, Mips::S5, Mips::S6, Mips::S7, + Mips::F20, Mips::F22, Mips::F24, Mips::F26, Mips::F28, Mips::F30, + Mips::D10, Mips::D11, Mips::D12, Mips::D13, Mips::D14, Mips::D15,0 + }; + + if (Subtarget.isSingleFloat()) + return SingleFloatOnlyCalleeSavedRegs; + else + return BitMode32CalleeSavedRegs; } /// Mips Callee Saved Register Classes const TargetRegisterClass const* MipsRegisterInfo::getCalleeSavedRegClasses(const MachineFunction MF) const { - static const TargetRegisterClass const CalleeSavedRegClasses[] = { - &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, + static const TargetRegisterClass * const SingleFloatOnlyCalleeSavedRC[] = { + &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, + &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, + &Mips::FGR32RegClass, &Mips::FGR32RegClass, &Mips::FGR32RegClass, + &Mips::FGR32RegClass, &Mips::FGR32RegClass, &Mips::FGR32RegClass, + &Mips::FGR32RegClass, &Mips::FGR32RegClass, &Mips::FGR32RegClass, + &Mips::FGR32RegClass, &Mips::FGR32RegClass, 0 + }; + + static const TargetRegisterClass * const BitMode32CalleeSavedRC[] = { + &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, + &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, - &Mips::CPURegsRegClass, &Mips::CPURegsRegClass, 0 + &Mips::AFGR32RegClass, &Mips::AFGR32RegClass, &Mips::AFGR32RegClass, + &Mips::AFGR32RegClass, &Mips::AFGR32RegClass, &Mips::AFGR32RegClass, + &Mips::AFGR64RegClass, &Mips::AFGR64RegClass, &Mips::AFGR64RegClass, + &Mips::AFGR64RegClass, &Mips::AFGR64RegClass, &Mips::AFGR64RegClass, 0 }; - return CalleeSavedRegClasses; + + if (Subtarget.isSingleFloat()) + return SingleFloatOnlyCalleeSavedRC; + else + return BitMode32CalleeSavedRC; } BitVector MipsRegisterInfo:: @@ -143,16 +172,18 @@ // to grow up! Otherwise terrible hacks would have to be made // to get this stack ABI compliant :) // -// The stack frame required by the ABI: +// The stack frame required by the ABI (after call): // Offset // // 0 ---------- -// 4 Args to pass +// 4 Args to pass // . saved $GP (used in PIC) +// . Alloca allocations // . Local Area -// . saved "Callee Saved" Registers +// . CPU "Callee Saved" Registers // . saved FP // . saved RA +// . FPU "Callee Saved" Registers // StackSize ----------- // // Offset - offset from sp after stack allocation on function prologue @@ -179,10 +210,112 @@ // possible to detect those references and the offsets are adjusted to // their real location. // -// -// //===----------------------------------------------------------------------===// +void MipsRegisterInfo::adjustMipsStackFrame(MachineFunction &MF) const +{ + MachineFrameInfo MFI = MF.getFrameInfo(); + MipsFunctionInfo MipsFI = MF.getInfo(); + const std::vector &CSI = MFI->getCalleeSavedInfo(); + unsigned StackAlign = MF.getTarget().getFrameInfo()->getStackAlignment(); + + // Min and Max CSI FrameIndex. + int MinCSFI = -1, MaxCSFI = -1; + + // See the description at MipsMachineFunction.h + int TopCPUSavedRegOff = -1, TopFPUSavedRegOff = -1; + + // Replace the dummy '0' SPOffset by the negative offsets, as explained on + // LowerFORMAL_ARGUMENTS. Leaving '0' for while is necessary to avoid + // the approach done by calculateFrameObjectOffsets to the stack frame. + MipsFI->adjustLoadArgsFI(MFI); + MipsFI->adjustStoreVarArgsFI(MFI); + + // It happens that the default stack frame allocation order does not directly + // map to the convention used for mips. So we must fix it. We move the callee + // save register slots after the local variables area, as described in the + // stack frame above. + unsigned CalleeSavedAreaSize = 0; + if (!CSI.empty()) { + MinCSFI = CSI[0].getFrameIdx(); + MaxCSFI = CSI[CSI.size()-1].getFrameIdx(); + } + for (unsigned i = 0, e = CSI.size(); i != e; ++i) + CalleeSavedAreaSize += MFI->getObjectAlignment(CSI[i].getFrameIdx()); + + // Adjust local variables. They should come on the stack right + // after the arguments. + int LastOffsetFI = -1; + for (int i = 0, e = MFI->getObjectIndexEnd(); i != e; ++i) { + if (i >= MinCSFI && i <= MaxCSFI) + continue; + unsigned Offset = MFI->getObjectOffset(i) - CalleeSavedAreaSize; + if (LastOffsetFI == -1) + LastOffsetFI = i; + if (Offset > MFI->getObjectOffset(LastOffsetFI)) + LastOffsetFI = i; + MFI->setObjectOffset(i, Offset); + } + + // Adjust CPU Callee Saved Registers Area. Registers RA and FP must + // be saved in this CPU Area there is the need. This whole Area must + // be aligned to the default Stack Alignment requirements. + unsigned StackOffset = 0; + unsigned RegSize = Subtarget.isGP32bit() ? 4 : 8; + + if (LastOffsetFI >= 0) + StackOffset = MFI->getObjectOffset(LastOffsetFI)+ + MFI->getObjectAlignment(LastOffsetFI); + + for (unsigned i = 0, e = CSI.size(); i != e ; ++i) { + if (CSI[i].getRegClass() != Mips::CPURegsRegisterClass) + break; + MFI->setObjectOffset(CSI[i].getFrameIdx(), StackOffset); + TopCPUSavedRegOff = StackOffset; + StackOffset += MFI->getObjectAlignment(CSI[i].getFrameIdx()); + } + + if (hasFP(MF)) { + MFI->setObjectOffset(MFI->CreateStackObject(RegSize, RegSize), + StackOffset); + MipsFI->setFPStackOffset(StackOffset); + TopCPUSavedRegOff = StackOffset; + StackOffset += RegSize; + } + + if (MFI->hasCalls()) { + MFI->setObjectOffset(MFI->CreateStackObject(RegSize, RegSize), + StackOffset); + MipsFI->setRAStackOffset(StackOffset); + TopCPUSavedRegOff = StackOffset; + StackOffset += RegSize; + } + StackOffset = ((StackOffset+StackAlign-1)/StackAlignStackAlign); + + // Adjust FPU Callee Saved Registers Area. This Area must be + // aligned to the default Stack Alignment requirements. + for (unsigned i = 0, e = CSI.size(); i != e; ++i) { + if (CSI[i].getRegClass() == Mips::CPURegsRegisterClass) + continue; + MFI->setObjectOffset(CSI[i].getFrameIdx(), StackOffset); + TopFPUSavedRegOff = StackOffset; + StackOffset += MFI->getObjectAlignment(CSI[i].getFrameIdx()); + } + StackOffset = ((StackOffset+StackAlign-1)/StackAlignStackAlign); + + // Update frame info + MFI->setStackSize(StackOffset); + + // Recalculate the final tops offset. The final values must be '0' + // if there isn't a callee saved register for CPU or FPU, otherwise + // a negative offset is needed. + if (TopCPUSavedRegOff >= 0) + MipsFI->setCPUTopSavedRegOff(TopCPUSavedRegOff-StackOffset); + + if (TopFPUSavedRegOff >= 0) + MipsFI->setFPUTopSavedRegOff(TopFPUSavedRegOff-StackOffset); +} + // hasFP - Return true if the specified function should have a dedicated frame // pointer register. This is true if the function has variable sized allocas or // if frame pointer elimination is disabled. @@ -256,60 +389,17 @@ MachineBasicBlock::iterator MBBI = MBB.begin(); bool isPIC = (MF.getTarget().getRelocationModel() == Reloc::PIC_); - // Replace the dummy '0' SPOffset by the negative - // offsets, as explained on LowerFORMAL_ARGUMENTS - MipsFI->adjustLoadArgsFI(MFI); - MipsFI->adjustStoreVarArgsFI(MFI); + // Get the right frame order for Mips. + adjustMipsStackFrame(MF); // Get the number of bytes to allocate from the FrameInfo. - int NumBytes = (int) MFI->getStackSize(); - - #ifndef NDEBUG - DOUT << "\n<--- EMIT PROLOGUE --->\n"; - DOUT << "Actual Stack size :" << NumBytes << "\n"; - #endif + unsigned StackSize = MFI->getStackSize(); // No need to allocate space on the stack. - if (NumBytes == 0 && !MFI->hasCalls()) return; - - int FPOffset, RAOffset; - - // Allocate space for saved RA and FP when needed - // FIXME: within 64-bit registers, change hardcoded - // sizes for RA and FP offsets. - if ((hasFP(MF)) && (MFI->hasCalls())) { - FPOffset = NumBytes; - RAOffset = (NumBytes+4); - NumBytes += 8; - } else if ((!hasFP(MF)) && (MFI->hasCalls())) { - FPOffset = 0; - RAOffset = NumBytes; - NumBytes += 4; - } else if ((hasFP(MF)) && (!MFI->hasCalls())) { - FPOffset = NumBytes; - RAOffset = 0; - NumBytes += 4; - } else { // No calls and no fp. - RAOffset = FPOffset = 0; - } - - MFI->setObjectOffset(MFI->CreateStackObject(4,4), FPOffset); - MFI->setObjectOffset(MFI->CreateStackObject(4,4), RAOffset); - MipsFI->setFPStackOffset(FPOffset); - MipsFI->setRAStackOffset(RAOffset); - - // Align stack. - unsigned Align = MF.getTarget().getFrameInfo()->getStackAlignment(); - NumBytes = ((NumBytes+Align-1)/AlignAlign); - - #ifndef NDEBUG - DOUT << "FPOffset :" << FPOffset << "\n"; - DOUT << "RAOffset :" << RAOffset << "\n"; - DOUT << "New stack size :" << NumBytes << "\n\n"; - #endif + if (StackSize == 0 && !MFI->hasCalls()) return; - // Update frame info - MFI->setStackSize(NumBytes); + int FPOffset = MipsFI->getFPStackOffset(); + int RAOffset = MipsFI->getRAStackOffset(); BuildMI(MBB, MBBI, TII.get(Mips::NOREORDER)); @@ -320,7 +410,7 @@ // Adjust stack : addi sp, sp, (-imm) BuildMI(MBB, MBBI, TII.get(Mips::ADDiu), Mips::SP) - .addReg(Mips::SP).addImm(-NumBytes); + .addReg(Mips::SP).addImm(-StackSize); // Save the return address only if the function isnt a leaf one. // sw $ra, stack_loc($sp) @@ -388,6 +478,7 @@ } } + void MipsRegisterInfo:: processFunctionBeforeFrameFinalized(MachineFunction &MF) const { // Set the SPOffset on the FI where GP must be saved/loaded. @@ -395,11 +486,6 @@ bool isPIC = (MF.getTarget().getRelocationModel() == Reloc::PIC_); if (MFI->hasCalls() && isPIC) { MipsFunctionInfo MipsFI = MF.getInfo(); - #ifndef NDEBUG - DOUT << "processFunctionBeforeFrameFinalized\n"; - DOUT << "GPOffset :" << MipsFI->getGPStackOffset() << "\n"; - DOUT << "FI :" << MipsFI->getGPFI() << "\n"; - #endif MFI->setObjectOffset(MipsFI->getGPFI(), MipsFI->getGPStackOffset()); } } Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h?rev=54403&r1=54402&r2=54403&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h (original) +++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.h Wed Aug 6 01:14:43 2008 @@ -36,6 +36,9 @@ /// Get PIC indirect call register static unsigned getPICCallReg(void); + /// Adjust the Mips stack frame. + void adjustMipsStackFrame(MachineFunction &MF) const; + /// Code Generation virtual methods... const unsigned getCalleeSavedRegs(const MachineFunction MF = 0) const; Modified: llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp?rev=54403&r1=54402&r2=54403&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsTargetMachine.cpp Wed Aug 6 01:14:43 2008 @@ -33,7 +33,8 @@ // The stack is always 8 byte aligned // On function prologue, the stack is created by decrementing // its pointer. Once decremented, all references are done with positive -// offset from the stack/frame pointer, so StackGrowsUp is used. +// offset from the stack/frame pointer, using StackGrowsUp enables +// an easier handling. // Using CodeModel::Large enables different CALL behavior. MipsTargetMachine:: MipsTargetMachine(const Module &M, const std::string &FS, bool isLittle=false): From isanbard at gmail.com Wed Aug 6 01:17:09 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 06:17:09 -0000 Subject: [llvm-commits] [llvm] r54404 - in /llvm/tags/Apple/llvmCore-2061: include/llvm/Target/TargetOptions.h lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp lib/Target/PowerPC/PPCISelLowering.cpp lib/Target/PowerPC/PPCTargetMachine.cpp lib/Target/TargetMachine.cpp utils/buildit/build_llvm Message-ID: <200808060617.m766H9uo009888@zion.cs.uiuc.edu> Author: void Date: Wed Aug 6 01:17:09 2008 New Revision: 54404 URL: http://llvm.org/viewvc/llvm-project?rev=54404&view=rev Log: Pull r54248 into llvmCore-2061: Add a flag to disable jump table generation (all switches use the binary search algorithm) for environments that don't support it. PPC64 JIT is such an environment; turn the flag on for that. Modified: llvm/tags/Apple/llvmCore-2061/include/llvm/Target/TargetOptions.h llvm/tags/Apple/llvmCore-2061/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCTargetMachine.cpp llvm/tags/Apple/llvmCore-2061/lib/Target/TargetMachine.cpp llvm/tags/Apple/llvmCore-2061/utils/buildit/build_llvm Modified: llvm/tags/Apple/llvmCore-2061/include/llvm/Target/TargetOptions.h URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/include/llvm/Target/TargetOptions.h?rev=54404&r1=54403&r2=54404&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2061/include/llvm/Target/TargetOptions.h (original) +++ llvm/tags/Apple/llvmCore-2061/include/llvm/Target/TargetOptions.h Wed Aug 6 01:17:09 2008 @@ -97,6 +97,10 @@ /// VerboseAsm - When this flag is set, the asm printer prints additional /// comments to asm directives. extern bool VerboseAsm; + + /// DisableJumpTables - This flag indicates jump tables should not be + /// generated. + extern bool DisableJumpTables; } // End llvm namespace #endif Modified: llvm/tags/Apple/llvmCore-2061/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54404&r1=54403&r2=54404&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2061/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/tags/Apple/llvmCore-2061/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed Aug 6 01:17:09 2008 @@ -1900,8 +1900,9 @@ } static inline bool areJTsAllowed(const TargetLowering &TLI) { - return (TLI.isOperationLegal(ISD::BR_JT, MVT::Other) \|\| - TLI.isOperationLegal(ISD::BRIND, MVT::Other)); + return !DisableJumpTables && + (TLI.isOperationLegal(ISD::BR_JT, MVT::Other) \|\| + TLI.isOperationLegal(ISD::BRIND, MVT::Other)); } /// handleJTSwitchCase - Emit jumptable for current switch case range Modified: llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp?rev=54404&r1=54403&r2=54404&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp (original) +++ llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp Wed Aug 6 01:17:09 2008 @@ -43,7 +43,7 @@ : TargetLowering(TM), PPCSubTarget(TM.getSubtargetImpl()) { setPow2DivIsCheap(); - + // Use _setjmp/_longjmp instead of setjmp/longjmp. setUseUnderscoreSetJmp(true); setUseUnderscoreLongJmp(true); Modified: llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCTargetMachine.cpp?rev=54404&r1=54403&r2=54404&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCTargetMachine.cpp (original) +++ llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCTargetMachine.cpp Wed Aug 6 01:17:09 2008 @@ -17,6 +17,7 @@ #include "llvm/Module.h" #include "llvm/PassManager.h" #include "llvm/Target/TargetMachineRegistry.h" +#include "llvm/Target/TargetOptions.h" using namespace llvm; // Register the targets @@ -144,6 +145,9 @@ // instructions to materialize arbitrary global variable + function + // constant pool addresses. setRelocationModel(Reloc::PIC_); + // Temporary workaround for the inability of PPC64 JIT to handle jump + // tables. + DisableJumpTables = true; } else { setRelocationModel(Reloc::Static); } Modified: llvm/tags/Apple/llvmCore-2061/lib/Target/TargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/lib/Target/TargetMachine.cpp?rev=54404&r1=54403&r2=54404&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2061/lib/Target/TargetMachine.cpp (original) +++ llvm/tags/Apple/llvmCore-2061/lib/Target/TargetMachine.cpp Wed Aug 6 01:17:09 2008 @@ -39,6 +39,7 @@ unsigned StackAlignment; bool RealignStack; bool VerboseAsm; + bool DisableJumpTables; } static cl::opt PrintCode("print-machineinstrs", @@ -156,6 +157,11 @@ cl::location(VerboseAsm), cl::init(false)); +static cl::opt +DisableSwitchTables(cl::Hidden, "disable-jump-tables", + cl::desc("Do not generate jump tables."), + cl::location(DisableJumpTables), + cl::init(false)); //--------------------------------------------------------------------------- // TargetMachine Class Modified: llvm/tags/Apple/llvmCore-2061/utils/buildit/build_llvm URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/utils/buildit/build_llvm?rev=54404&r1=54403&r2=54404&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2061/utils/buildit/build_llvm (original) +++ llvm/tags/Apple/llvmCore-2061/utils/buildit/build_llvm Wed Aug 6 01:17:09 2008 @@ -138,8 +138,7 @@ make $JOBS_FLAG $OPTIMIZE_OPTS UNIVERSAL=1 UNIVERSAL_ARCH="$TARGETS" \ LLVM_SUBMIT_VERSION=$LLVM_SUBMIT_VERSION \ LLVM_SUBMIT_SUBVERSION=$LLVM_SUBMIT_SUBVERSION \ - CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" \ - CC=/usr/bin/gcc-4.0 CXX=/usr/bin/g++-4.0 + CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" if ! test $? == 0 ; then echo "error: LLVM 'make' failed!" From isanbard at gmail.com Wed Aug 6 01:20:07 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 06:20:07 -0000 Subject: [llvm-commits] [llvm] r54405 - in /llvm/tags/Apple/llvmCore-2061: lib/Target/PowerPC/PPCISelLowering.cpp test/CodeGen/PowerPC/2008-07-24-PPC64-CCBug.ll Message-ID: <200808060620.m766K7Sx009987@zion.cs.uiuc.edu> Author: void Date: Wed Aug 6 01:20:07 2008 New Revision: 54405 URL: http://llvm.org/viewvc/llvm-project?rev=54405&view=rev Log: Pull r53979 into llvmCore-2061: Fix a catastrophic PPC64 ABI bug: i32 operands which are passed in memory (all of the parameter registers are used) are loaded from sp offsets that were off by 4. Added: llvm/tags/Apple/llvmCore-2061/test/CodeGen/PowerPC/2008-07-24-PPC64-CCBug.ll Modified: llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp Modified: llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp?rev=54405&r1=54404&r2=54405&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp (original) +++ llvm/tags/Apple/llvmCore-2061/lib/Target/PowerPC/PPCISelLowering.cpp Wed Aug 6 01:20:07 2008 @@ -1582,6 +1582,7 @@ ++GPR_idx; } else { needsLoad = true; + ArgSize = PtrByteSize; } // All int arguments reserve stack space in Macho ABI. if (isMachoABI \|\| needsLoad) ArgOffset += 8; Added: llvm/tags/Apple/llvmCore-2061/test/CodeGen/PowerPC/2008-07-24-PPC64-CCBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/test/CodeGen/PowerPC/2008-07-24-PPC64-CCBug.ll?rev=54405&view=auto ============================================================================== --- llvm/tags/Apple/llvmCore-2061/test/CodeGen/PowerPC/2008-07-24-PPC64-CCBug.ll (added) +++ llvm/tags/Apple/llvmCore-2061/test/CodeGen/PowerPC/2008-07-24-PPC64-CCBug.ll Wed Aug 6 01:20:07 2008 @@ -0,0 +1,11 @@ +; RUN: llvm-as < %s \| llc -mtriple=powerpc64-apple-darwin \| grep lwz \| grep 228 + +@"\01LC" = internal constant [4 x i8] c"%d\0A\00" ; <[4 x i8]> [#uses=1] + +define void @llvm_static_func(i32 %a0, i32 %a1, i32 %a2, i32 %a3, i32 %a4, i32 %a5, i32 %a6, i32 %a7, i32 %a8, i32 %a9, i32 %a10, i32 %a11, i32 %a12, i32 %a13, i32 %a14, i32 %a15) nounwind { +entry: + tail call i32 (i8, ...) @printf( i8* getelementptr ([4 x i8]* @"\01LC", i32 0, i64 0), i32 %a8 ) nounwind ; :0 [#uses=0] + ret void +} + +declare i32 @printf(i8, ...) nounwind From sabre at nondot.org Wed Aug 6 02:35:53 2008 From: sabre at nondot.org (Chris Lattner) Date: Wed, 06 Aug 2008 07:35:53 -0000 Subject: [llvm-commits] [llvm] r54408 - in /llvm/trunk: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/sext-misc.ll Message-ID: <200808060735.m767Zrt2012926@zion.cs.uiuc.edu> Author: lattner Date: Wed Aug 6 02:35:52 2008 New Revision: 54408 URL: http://llvm.org/viewvc/llvm-project?rev=54408&view=rev Log: optimize a common idiom generated by clang for bitfield access, PR2638. Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp llvm/trunk/test/Transforms/InstCombine/sext-misc.ll Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=54408&r1=54407&r2=54408&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Wed Aug 6 02:35:52 2008 @@ -7666,7 +7666,37 @@ return new TruncInst(Op, CI.getType(), "tmp"); } } - + + // If the input is a shl/ashr pair of a same constant, then this is a sign + // extension from a smaller value. If we could trust arbitrary bitwidth + // integers, we could turn this into a truncate to the smaller bit and then + // use a sext for the whole extension. Since we don't, look deeper and check + // for a truncate. If the source and dest are the same type, eliminate the + // trunc and extend and just do shifts. For example, turn: + // %a = trunc i32 %i to i8 + // %b = shl i8 %a, 6 + // %c = ashr i8 %b, 6 + // %d = sext i8 %c to i32 + // into: + // %a = shl i32 %i, 30 + // %d = ashr i32 %a, 30 + Value A = 0; + ConstantInt BA = 0, CA = 0; + if (match(Src, m_AShr(m_Shl(m_Value(A), m_ConstantInt(BA)), + m_ConstantInt(CA))) && + BA == CA && isa(A)) { + Value I = cast(A)->getOperand(0); + if (I->getType() == CI.getType()) { + unsigned MidSize = Src->getType()->getPrimitiveSizeInBits(); + unsigned SrcDstSize = CI.getType()->getPrimitiveSizeInBits(); + unsigned ShAmt = CA->getZExtValue()+SrcDstSize-MidSize; + Constant ShAmtV = ConstantInt::get(CI.getType(), ShAmt); + I = InsertNewInstBefore(BinaryOperator::CreateShl(I, ShAmtV, + CI.getName()), CI); + return BinaryOperator::CreateAShr(I, ShAmtV); + } + } + return 0; } Modified: llvm/trunk/test/Transforms/InstCombine/sext-misc.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/sext-misc.ll?rev=54408&r1=54407&r2=54408&view=diff ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/sext-misc.ll (original) +++ llvm/trunk/test/Transforms/InstCombine/sext-misc.ll Wed Aug 6 02:35:52 2008 @@ -63,3 +63,13 @@ ret i16 %W } +; PR2638 +define i32 @test2(i32 %i) nounwind { +entry: + %tmp12 = trunc i32 %i to i8 ; [#uses=1] + %tmp16 = shl i8 %tmp12, 6 ; [#uses=1] + %a = ashr i8 %tmp16, 6 ; [#uses=1] + %b = sext i8 %a to i32 ; [#uses=1] + ret i32 %b +} + From gohman at apple.com Wed Aug 6 10:18:33 2008 From: gohman at apple.com (Dan Gohman) Date: Wed, 06 Aug 2008 15:18:33 -0000 Subject: [llvm-commits] [llvm] r54409 - /llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Message-ID: <200808061518.m76FIbnl011104@zion.cs.uiuc.edu> Author: djg Date: Wed Aug 6 10:18:10 2008 New Revision: 54409 URL: http://llvm.org/viewvc/llvm-project?rev=54409&view=rev Log: Clarify "node" vs. "value" in some comments. Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h?rev=54409&r1=54408&r2=54409&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAGNodes.h Wed Aug 6 10:18:10 2008 @@ -1101,17 +1101,17 @@ return ~NodeType; } - /// use_empty - Return true if there are no uses of this value. + /// use_empty - Return true if there are no uses of this node. /// bool use_empty() const { return Uses == NULL; } - /// hasOneUse - Return true if there is exactly one use of this value. + /// hasOneUse - Return true if there is exactly one use of this node. /// bool hasOneUse() const { return !use_empty() && next(use_begin()) == use_end(); } - /// use_size - Return the number of uses of this value. This method takes + /// use_size - Return the number of uses of this node. This method takes /// time proportional to the number of uses. /// size_t use_size() const { return std::distance(use_begin(), use_end()); } From gohman at apple.com Wed Aug 6 10:52:50 2008 From: gohman at apple.com (Dan Gohman) Date: Wed, 06 Aug 2008 15:52:50 -0000 Subject: [llvm-commits] [llvm] r54411 - in /llvm/trunk/lib/Target/X86: X86Instr64bit.td X86InstrInfo.td Message-ID: <200808061552.m76FqoVA013193@zion.cs.uiuc.edu> Author: djg Date: Wed Aug 6 10:52:50 2008 New Revision: 54411 URL: http://llvm.org/viewvc/llvm-project?rev=54411&view=rev Log: xchg does not modify FLAGS. Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td llvm/trunk/lib/Target/X86/X86InstrInfo.td Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Instr64bit.td?rev=54411&r1=54410&r2=54411&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86Instr64bit.td (original) +++ llvm/trunk/lib/Target/X86/X86Instr64bit.td Wed Aug 6 10:52:50 2008 @@ -1125,7 +1125,8 @@ [(X86cas addr:$ptr, GR64:$swap, 8)]>, TB, LOCK; } -let Constraints = "$val = $dst", Defs = [EFLAGS] in { +let Constraints = "$val = $dst" in { +let Defs = [EFLAGS] in def LXADD64 : RI<0xC1, MRMSrcMem, (outs GR64:$dst), (ins i64mem:$ptr,GR64:$val), "lock xadd $val, $ptr", [(set GR64:$dst, (atomic_load_add_64 addr:$ptr, GR64:$val))]>, Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=54411&r1=54410&r2=54411&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Wed Aug 6 10:52:50 2008 @@ -2582,7 +2582,7 @@ // Atomic swap. These are just normal xchg instructions. But since a memory // operand is referenced, the atomicity is ensured. -let Constraints = "$val = $dst", Defs = [EFLAGS] in { +let Constraints = "$val = $dst" in { def XCHG32rm : I<0x87, MRMSrcMem, (outs GR32:$dst), (ins i32mem:$ptr, GR32:$val), "xchg{l}\t{$val, $ptr\|$ptr, $val}", [(set GR32:$dst, (atomic_swap_32 addr:$ptr, GR32:$val))]>; From evan.cheng at apple.com Wed Aug 6 13:04:45 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Wed, 06 Aug 2008 18:04:45 -0000 Subject: [llvm-commits] [llvm] r54415 - in /llvm/trunk: lib/Transforms/Scalar/LoopStrengthReduce.cpp test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll Message-ID: <200808061804.m76I4kEH017256@zion.cs.uiuc.edu> Author: evancheng Date: Wed Aug 6 13:04:43 2008 New Revision: 54415 URL: http://llvm.org/viewvc/llvm-project?rev=54415&view=rev Log: Fix PR2355: bug in ChangeCompareStride. When the loop termination compare is the only use of its iv stride, the stride can be eliminated by moving it to another stride. If the scale is negative, swap the predicate instead of using a inverse predicate. Added: llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll Modified: llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp Modified: llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp?rev=54415&r1=54414&r2=54415&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/LoopStrengthReduce.cpp Wed Aug 6 13:04:43 2008 @@ -1624,10 +1624,10 @@ continue; } - // If scale is negative, use inverse predicate unless it's testing + // If scale is negative, use swapped predicate unless it's testing // for equality. if (Scale < 0 && !Cond->isEquality()) - Predicate = ICmpInst::getInversePredicate(Predicate); + Predicate = ICmpInst::getSwappedPredicate(Predicate); NewStride = &StrideOrder[i]; break; Added: llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll?rev=54415&view=auto ============================================================================== --- llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll (added) +++ llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll Wed Aug 6 13:04:43 2008 @@ -0,0 +1,24 @@ +; RUN: llvm-as < %s \| opt -loop-reduce \| llvm-dis \| grep ugt +; PR2355 + + at .str = internal constant [4 x i8] c"%d\0A\00" + +declare i32 @printf(i8* noalias , ...) nounwind + +define i32 @main() nounwind { +entry: + br label %forbody + +forbody: + %i.0 = phi i32 [ 0, %entry ], [ %inc, %forbody ] ; [#uses=3] + %sub14 = sub i32 1027, %i.0 ; [#uses=1] + %mul15 = mul i32 %sub14, 10 ; [#uses=1] + %add166 = or i32 %mul15, 1 ; [#uses=1] * + call i32 (i8, ...) @printf( i8* noalias getelementptr ([4 x i8]* @.str, i32 0, i32 0), i32 %add166 ) nounwind + %inc = add i32 %i.0, 1 ; [#uses=3] + %cmp = icmp ult i32 %inc, 1027 ; [#uses=1] + br i1 %cmp, label %forbody, label %afterfor + +afterfor: ; preds = %forcond + ret i32 0 +} From evan.cheng at apple.com Wed Aug 6 13:06:48 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Wed, 06 Aug 2008 18:06:48 -0000 Subject: [llvm-commits] [llvm] r54416 - /llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll Message-ID: <200808061806.m76I6mQm017348@zion.cs.uiuc.edu> Author: evancheng Date: Wed Aug 6 13:06:48 2008 New Revision: 54416 URL: http://llvm.org/viewvc/llvm-project?rev=54416&view=rev Log: PR2535, not PR2355. Modified: llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll Modified: llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll?rev=54416&r1=54415&r2=54416&view=diff ============================================================================== --- llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll (original) +++ llvm/trunk/test/Transforms/LoopStrengthReduce/2008-08-06-CmpStride.ll Wed Aug 6 13:06:48 2008 @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s \| opt -loop-reduce \| llvm-dis \| grep ugt -; PR2355 +; PR2535 @.str = internal constant [4 x i8] c"%d\0A\00" From gohman at apple.com Wed Aug 6 13:17:34 2008 From: gohman at apple.com (Dan Gohman) Date: Wed, 06 Aug 2008 18:17:34 -0000 Subject: [llvm-commits] [llvm] r54417 - in /llvm/trunk: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/shufflemask-undef.ll Message-ID: <200808061817.m76IHYud017824@zion.cs.uiuc.edu> Author: djg Date: Wed Aug 6 13:17:32 2008 New Revision: 54417 URL: http://llvm.org/viewvc/llvm-project?rev=54417&view=rev Log: Fix a shufflevector instcombine that was emitting invalid masks indices when it meant to be emitting undef indices. Added: llvm/trunk/test/Transforms/InstCombine/shufflemask-undef.ll Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Modified: llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp?rev=54417&r1=54416&r2=54417&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/trunk/lib/Transforms/Scalar/InstructionCombining.cpp Wed Aug 6 13:17:32 2008 @@ -11259,11 +11259,13 @@ Elts.push_back(UndefValue::get(Type::Int32Ty)); else { if ((Mask[i] >= e && isa(RHS)) \|\| - (Mask[i] < e && isa(LHS))) + (Mask[i] < e && isa(LHS))) { Mask[i] = 2e; // Turn into undef. - else + Elts.push_back(UndefValue::get(Type::Int32Ty)); + } else { Mask[i] &= (e-1); // Force to LHS. - Elts.push_back(ConstantInt::get(Type::Int32Ty, Mask[i])); + Elts.push_back(ConstantInt::get(Type::Int32Ty, Mask[i])); + } } } SVI.setOperand(0, SVI.getOperand(1)); Added: llvm/trunk/test/Transforms/InstCombine/shufflemask-undef.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/InstCombine/shufflemask-undef.ll?rev=54417&view=auto ============================================================================== --- llvm/trunk/test/Transforms/InstCombine/shufflemask-undef.ll (added) +++ llvm/trunk/test/Transforms/InstCombine/shufflemask-undef.ll Wed Aug 6 13:17:32 2008 @@ -0,0 +1,109 @@ +; RUN: llvm-as < %s \| opt -instcombine \| llvm-dis \| not grep {shufflevector.\i32 8} + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128" +target triple = "i386-apple-darwin9" + %struct.ActiveTextureTargets = type { i64, i64, i64, i64, i64, i64 } + %struct.AlphaTest = type { float, i16, i8, i8 } + %struct.ArrayRange = type { i8, i8, i8, i8 } + %struct.BlendMode = type { i16, i16, i16, i16, %struct.IColor4, i16, i16, i8, i8, i8, i8 } + %struct.ClearColor = type { double, %struct.IColor4, %struct.IColor4, float, i32 } + %struct.ClipPlane = type { i32, [6 x %struct.IColor4] } + %struct.ColorBuffer = type { i16, i8, i8, [8 x i16], [0 x i32] } + %struct.ColorMatrix = type { [16 x float], %struct.ImagingColorScale } + %struct.Convolution = type { %struct.IColor4, %struct.ImagingColorScale, i16, i16, [0 x i32], float, i32, i32 } + %struct.DepthTest = type { i16, i16, i8, i8, i8, i8, double, double } + %struct.FixedFunction = type { %struct.PPStreamToken* } + %struct.FogMode = type { %struct.IColor4, float, float, float, float, float, i16, i16, i16, i8, i8 } + %struct.HintMode = type { i16, i16, i16, i16, i16, i16, i16, i16, i16, i16 } + %struct.Histogram = type { %struct.ProgramLimits, i32, i16, i8, i8 } + %struct.ImagingColorScale = type { %struct.TCoord2, %struct.TCoord2, %struct.TCoord2, %struct.TCoord2 } + %struct.ImagingSubset = type { %struct.Convolution, %struct.Convolution, %struct.Convolution, %struct.ColorMatrix, %struct.Minmax, %struct.Histogram, %struct.ImagingColorScale, %struct.ImagingColorScale, %struct.ImagingColorScale, %struct.ImagingColorScale, i32, [0 x i32] } + %struct.Light = type { %struct.IColor4, %struct.IColor4, %struct.IColor4, %struct.IColor4, %struct.PointLineLimits, float, float, float, float, float, %struct.PointLineLimits, float, %struct.PointLineLimits, float, %struct.PointLineLimits, float, float, float, float, float } + %struct.LightModel = type { %struct.IColor4, [8 x %struct.Light], [2 x %struct.Material], i32, i16, i16, i16, i8, i8, i8, i8, i8, i8 } + %struct.LightProduct = type { %struct.IColor4, %struct.IColor4, %struct.IColor4 } + %struct.LineMode = type { float, i32, i16, i16, i8, i8, i8, i8 } + %struct.LogicOp = type { i16, i8, i8 } + %struct.MaskMode = type { i32, [3 x i32], i8, i8, i8, i8, i8, i8, i8, i8 } + %struct.Material = type { %struct.IColor4, %struct.IColor4, %struct.IColor4, %struct.IColor4, float, float, float, float, [8 x %struct.LightProduct], %struct.IColor4, [8 x i32] } + %struct.Minmax = type { %struct.MinmaxTable, i16, i8, i8, [0 x i32] } + %struct.MinmaxTable = type { %struct.IColor4, %struct.IColor4 } + %struct.Mipmaplevel = type { [4 x i32], [4 x i32], [4 x float], [4 x i32], i32, i32, float, i8, i16, i16, i16, i16, [2 x float] } + %struct.Multisample = type { float, i8, i8, i8, i8, i8, i8, i8, i8 } + %struct.PipelineProgramState = type { i8, i8, i8, i8, [0 x i32], %struct.IColor4* } + %struct.PixelMap = type { i32, float, float, float, float, float, float, float, float, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 } + %struct.PixelMode = type { float, float, %struct.PixelStore, %struct.PixelTransfer, %struct.PixelMap, %struct.ImagingSubset, i32, i32 } + %struct.PixelPack = type { i32, i32, i32, i32, i32, i32, i32, i32, i8, i8, i8, i8 } + %struct.PixelStore = type { %struct.PixelPack, %struct.PixelPack } + %struct.PixelTransfer = type { float, float, float, float, float, float, float, float, float, float, i32, i32, float, float, float, float, float, float, float, float, float, float, float, float } + %struct.PluginBufferData = type { i32 } + %struct.PointLineLimits = type { float, float, float } + %struct.PointMode = type { float, float, float, float, %struct.PointLineLimits, float, i8, i8, i8, i8, i16, i16, i32, i16, i16 } + %struct.PolygonMode = type { [128 x i8], float, float, i16, i16, i16, i16, i8, i8, i8, i8, i8, i8, i8, i8 } + %struct.ProgramLimits = type { i32, i32, i32, i32 } + %struct.RegisterCombiners = type { i8, i8, i8, i8, i32, [2 x %struct.IColor4], [8 x %struct.RegisterCombinersPerStageState], %struct.RegisterCombinersFinalStageState } + %struct.RegisterCombinersFinalStageState = type { i8, i8, i8, i8, [7 x %struct.RegisterCombinersPerVariableState] } + %struct.RegisterCombinersPerPortionState = type { [4 x %struct.RegisterCombinersPerVariableState], i8, i8, i8, i8, i16, i16, i16, i16, i16, i16 } + %struct.RegisterCombinersPerStageState = type { [2 x %struct.RegisterCombinersPerPortionState], [2 x %struct.IColor4] } + %struct.RegisterCombinersPerVariableState = type { i16, i16, i16, i16 } + %struct.SWRSurfaceRec = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i8, i8, i8, [4 x i8], i32 } + %struct.ScissorTest = type { %struct.ProgramLimits, i8, i8, i8, i8 } + %struct.State = type <{ i16, i16, i16, i16, i32, i32, [256 x %struct.IColor4], [128 x %struct.IColor4], %struct.Viewport, %struct.Transform, %struct.LightModel, %struct.ActiveTextureTargets, %struct.AlphaTest, %struct.BlendMode, %struct.ClearColor, %struct.ColorBuffer, %struct.DepthTest, %struct.ArrayRange, %struct.FogMode, %struct.HintMode, %struct.LineMode, %struct.LogicOp, %struct.MaskMode, %struct.PixelMode, %struct.PointMode, %struct.PolygonMode, %struct.ScissorTest, i32, %struct.StencilTest, [8 x %struct.TextureMode], [16 x %struct.TextureImageMode], %struct.ArrayRange, [8 x %struct.TextureCoordGen], %struct.ClipPlane, %struct.Multisample, %struct.RegisterCombiners, %struct.ArrayRange, %struct.ArrayRange, [3 x %struct.PipelineProgramState], %struct.ArrayRange, %struct.TransformFeedback, i32, %struct.FixedFunction, [3 x i32], [3 x i32] }> + %struct.StencilTest = type { [3 x { i32, i32, i16, i16, i16, i16 }], i32, [4 x i8] } + %struct.TextureCoordGen = type { { i16, i16, %struct.IColor4, %struct.IColor4 }, { i16, i16, %struct.IColor4, %struct.IColor4 }, { i16, i16, %struct.IColor4, %struct.IColor4 }, { i16, i16, %struct.IColor4, %struct.IColor4 }, i8, i8, i8, i8 } + %struct.TextureGeomState = type { i16, i16, i16, i16, i16, i8, i8, i8, i8, i16, i16, i16, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, [6 x i16], [6 x i16] } + %struct.TextureImageMode = type { float } + %struct.TextureLevel = type { i32, i32, i16, i16, i16, i8, i8, i16, i16, i16, i16, i8 } + %struct.TextureMode = type { %struct.IColor4, i32, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, float, float, i16, i16, i16, i16, i16, i16, [4 x i16], i8, i8, i8, i8, [3 x float], [4 x float], float, float } + %struct.TextureParamState = type { i16, i16, i16, i16, i16, i16, %struct.IColor4, float, float, float, float, i16, i16, i16, i16, float, i16, i8, i8, i32, i8* } + %struct.TextureRec = type { [4 x float], %struct.TextureState, %struct.Mipmaplevel, %struct.Mipmaplevel, float, float, float, float, i8, i8, i8, i8, i16, i16, i16, i16, i32, float, [2 x %struct.PPStreamToken] } + %struct.TextureState = type { i16, i8, i8, i16, i16, float, i32, %struct.SWRSurfaceRec, %struct.TextureParamState, %struct.TextureGeomState, [0 x i32], i8, i32, %struct.TextureLevel, [1 x [15 x %struct.TextureLevel]] } + %struct.Transform = type <{ [24 x [16 x float]], [24 x [16 x float]], [16 x float], float, float, float, float, float, i8, i8, i8, i8, i32, i32, i32, i16, i16, i8, i8, i8, i8, i32 }> + %struct.TransformFeedback = type { i8, i8, i8, i8, [0 x i32], [16 x i32], [16 x i32] } + %struct.Viewport = type { float, float, float, float, float, float, float, float, float, float, float, float, float, float, float, float, double, double, i32, i32, i32, i32, float, float, float, float } + %struct.IColor4 = type { float, float, float, float } + %struct.TCoord2 = type { float, float } + %struct.VMGPStack = type { [6 x <4 x float>], <4 x float>, i32, i32, <4 x float>, <4 x float>*, i32, i32, i32, i32, i32, i32 } + %struct.VMTextures = type { [16 x %struct.TextureRec] } + %struct.PPStreamToken = type { { i16, i16, i32 } } + %struct._VMConstants = type { <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, float, float, float, float, float, float, float, float, float, float, float, float, [256 x float], [528 x i8], { void (i8, i8, i32, i8), float (float), float (float), float (float), i32 (float) } } + +define i32 @foo(%struct.State* %dst, <4 x float>* %prgrm, <4 x float>** %buffs, %struct._VMConstants* %cnstn, %struct.PPStreamToken* %pstrm, %struct.PluginBufferData* %gpctx, %struct.VMTextures* %txtrs, %struct.VMGPStack* %gpstk) nounwind { +bb266.i: + getelementptr <4 x float>* null, i32 11 ; <<4 x float>>:0 [#uses=1] + load <4 x float> %0, align 16 ; <<4 x float>>:1 [#uses=1] + shufflevector <4 x float> %1, <4 x float> undef, <4 x i32> < i32 0, i32 1, i32 1, i32 1 > ; <<4 x float>>:2 [#uses=1] + shufflevector <4 x float> %2, <4 x float> undef, <4 x i32> < i32 0, i32 4, i32 1, i32 5 > ; <<4 x float>>:3 [#uses=1] + shufflevector <4 x float> undef, <4 x float> undef, <4 x i32> < i32 0, i32 4, i32 1, i32 5 > ; <<4 x float>>:4 [#uses=1] + shufflevector <4 x float> %4, <4 x float> %3, <4 x i32> < i32 6, i32 7, i32 2, i32 3 > ; <<4 x float>>:5 [#uses=1] + mul <4 x float> %5, zeroinitializer ; <<4 x float>>:6 [#uses=2] + mul <4 x float> %6, %6 ; <<4 x float>>:7 [#uses=1] + add <4 x float> zeroinitializer, %7 ; <<4 x float>>:8 [#uses=1] + call <4 x float> @llvm.x86.sse.max.ps( <4 x float> zeroinitializer, <4 x float> %8 ) nounwind readnone ; <<4 x float>>:9 [#uses=1] + %phitmp40 = bitcast <4 x float> %9 to <4 x i32> ; <<4 x i32>> [#uses=1] + %tmp4109.i = and <4 x i32> %phitmp40, < i32 8388607, i32 8388607, i32 8388607, i32 8388607 > ; <<4 x i32>> [#uses=1] + %tmp4116.i = or <4 x i32> %tmp4109.i, < i32 1065353216, i32 1065353216, i32 1065353216, i32 1065353216 > ; <<4 x i32>> [#uses=1] + %tmp4117.i = bitcast <4 x i32> %tmp4116.i to <4 x float> ; <<4 x float>> [#uses=1] + add <4 x float> %tmp4117.i, zeroinitializer ; <<4 x float>>:10 [#uses=1] + mul <4 x float> %10, < float 5.000000e-01, float 5.000000e-01, float 5.000000e-01, float 5.000000e-01 > ; <<4 x float>>:11 [#uses=1] + call <4 x float> @llvm.x86.sse.max.ps( <4 x float> %11, <4 x float> zeroinitializer ) nounwind readnone ; <<4 x float>>:12 [#uses=1] + call <4 x float> @llvm.x86.sse.min.ps( <4 x float> %12, <4 x float> zeroinitializer ) nounwind readnone ; <<4 x float>>:13 [#uses=1] + %tmp4170.i = call <4 x float> @llvm.x86.sse.cmp.ps( <4 x float> %13, <4 x float> zeroinitializer, i8 2 ) nounwind ; <<4 x float>> [#uses=1] + bitcast <4 x float> %tmp4170.i to <16 x i8> ; <<16 x i8>>:14 [#uses=1] + call i32 @llvm.x86.sse2.pmovmskb.128( <16 x i8> %14 ) nounwind readnone ; :15 [#uses=1] + icmp eq i32 %15, 0 ; :16 [#uses=1] + br i1 %16, label %bb5574.i, label %bb4521.i + +bb4521.i: ; preds = %bb266.i + unreachable + +bb5574.i: ; preds = %bb266.i + unreachable +} + +declare <4 x float> @llvm.x86.sse.cmp.ps(<4 x float>, <4 x float>, i8) nounwind readnone + +declare i32 @llvm.x86.sse2.pmovmskb.128(<16 x i8>) nounwind readnone + +declare <4 x float> @llvm.x86.sse.max.ps(<4 x float>, <4 x float>) nounwind readnone + +declare <4 x float> @llvm.x86.sse.min.ps(<4 x float>, <4 x float>) nounwind readnone From gohman at apple.com Wed Aug 6 13:27:22 2008 From: gohman at apple.com (Dan Gohman) Date: Wed, 06 Aug 2008 18:27:22 -0000 Subject: [llvm-commits] [llvm] r54418 - in /llvm/trunk: lib/Target/X86/X86Instr64bit.td lib/Target/X86/X86InstrInfo.td test/CodeGen/X86/zext-inreg-0.ll test/CodeGen/X86/zext-inreg-2.ll Message-ID: <200808061827.m76IRNiB018155@zion.cs.uiuc.edu> Author: djg Date: Wed Aug 6 13:27:21 2008 New Revision: 54418 URL: http://llvm.org/viewvc/llvm-project?rev=54418&view=rev Log: Re-introduce the 8-bit subreg zext-inreg patterns for x86-32, this time using MOV32to32_ and MOV16to16_. Thanks to Evan for suggesting this. Removed: llvm/trunk/test/CodeGen/X86/zext-inreg-2.ll Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td llvm/trunk/lib/Target/X86/X86InstrInfo.td llvm/trunk/test/CodeGen/X86/zext-inreg-0.ll Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Instr64bit.td?rev=54418&r1=54417&r2=54418&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86Instr64bit.td (original) +++ llvm/trunk/lib/Target/X86/X86Instr64bit.td Wed Aug 6 13:27:21 2008 @@ -1251,12 +1251,6 @@ // r & (2^8-1) ==> movz def : Pat<(and GR64:$src, 0xff), (MOVZX64rr8 (i8 (EXTRACT_SUBREG GR64:$src, x86_subreg_8bit)))>; - -// TODO: The following two patterns could be adapted to apply to x86-32, except -// that they'll need some way to deal with the fact that in x86-32 not all GPRs -// have 8-bit subregs. The GR32_ and GR16_ classes are a step in this direction, -// but they aren't ready for this purpose yet. - // r & (2^8-1) ==> movz def : Pat<(and GR32:$src1, 0xff), (MOVZX32rr8 (i8 (EXTRACT_SUBREG GR32:$src1, x86_subreg_8bit)))>, Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.td?rev=54418&r1=54417&r2=54418&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.td Wed Aug 6 13:27:21 2008 @@ -2774,6 +2774,16 @@ // r & (2^16-1) ==> movz def : Pat<(and GR32:$src1, 0xffff), (MOVZX32rr16 (i16 (EXTRACT_SUBREG GR32:$src1, x86_subreg_16bit)))>; +// r & (2^8-1) ==> movz +def : Pat<(and GR32:$src1, 0xff), + (MOVZX32rr8 (i8 (EXTRACT_SUBREG (MOV32to32_ GR32:$src1), + x86_subreg_8bit)))>, + Requires<[In32BitMode]>; +// r & (2^8-1) ==> movz +def : Pat<(and GR16:$src1, 0xff), + (MOVZX16rr8 (i8 (EXTRACT_SUBREG (MOV16to16_ GR16:$src1), + x86_subreg_8bit)))>, + Requires<[In32BitMode]>; // (shl x, 1) ==> (add x, x) def : Pat<(shl GR8 :$src1, (i8 1)), (ADD8rr GR8 :$src1, GR8 :$src1)>; Modified: llvm/trunk/test/CodeGen/X86/zext-inreg-0.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/zext-inreg-0.ll?rev=54418&r1=54417&r2=54418&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/zext-inreg-0.ll (original) +++ llvm/trunk/test/CodeGen/X86/zext-inreg-0.ll Wed Aug 6 13:27:21 2008 @@ -8,11 +8,26 @@ ; These should use movzbl instead of 'and 255'. ; This related to not having a ZERO_EXTEND_REG opcode. +define i32 @a(i32 %d) nounwind { + %e = add i32 %d, 1 + %retval = and i32 %e, 255 + ret i32 %retval +} +define i32 @b(float %d) nounwind { + %tmp12 = fptoui float %d to i8 + %retval = zext i8 %tmp12 to i32 + ret i32 %retval +} define i32 @c(i32 %d) nounwind { %e = add i32 %d, 1 %retval = and i32 %e, 65535 ret i32 %retval } +define i64 @d(i64 %d) nounwind { + %e = add i64 %d, 1 + %retval = and i64 %e, 255 + ret i64 %retval +} define i64 @e(i64 %d) nounwind { %e = add i64 %d, 1 %retval = and i64 %e, 65535 Removed: llvm/trunk/test/CodeGen/X86/zext-inreg-2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/zext-inreg-2.ll?rev=54417&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/zext-inreg-2.ll (original) +++ llvm/trunk/test/CodeGen/X86/zext-inreg-2.ll (removed) @@ -1,28 +0,0 @@ -; RUN: llvm-as < %s \| llc -march=x86-64 > %t -; RUN: not grep and %t -; RUN: not grep movzbq %t -; RUN: not grep movzwq %t -; RUN: not grep movzlq %t - -; These should use movzbl instead of 'and 255'. -; This related to not having a ZERO_EXTEND_REG opcode. - -; This test was split out of zext-inreg-0.ll because these -; cases don't yet work on x86-32 due to the 8-bit subreg -; issue. - -define i32 @a(i32 %d) nounwind { - %e = add i32 %d, 1 - %retval = and i32 %e, 255 - ret i32 %retval -} -define i32 @b(float %d) nounwind { - %tmp12 = fptoui float %d to i8 - %retval = zext i8 %tmp12 to i32 - ret i32 %retval -} -define i64 @d(i64 %d) nounwind { - %e = add i64 %d, 1 - %retval = and i64 %e, 255 - ret i64 %retval -} From isanbard at gmail.com Wed Aug 6 13:35:40 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 18:35:40 -0000 Subject: [llvm-commits] [llvm] r54419 - in /llvm/tags/Apple/llvmCore-2061: lib/Transforms/Scalar/InstructionCombining.cpp test/Transforms/InstCombine/shufflemask-undef.ll Message-ID: <200808061835.m76IZgGo018446@zion.cs.uiuc.edu> Author: void Date: Wed Aug 6 13:35:31 2008 New Revision: 54419 URL: http://llvm.org/viewvc/llvm-project?rev=54419&view=rev Log: Porting r54417 into llvmCore-2061: Added: llvm/tags/Apple/llvmCore-2061/test/Transforms/InstCombine/shufflemask-undef.ll Modified: llvm/tags/Apple/llvmCore-2061/lib/Transforms/Scalar/InstructionCombining.cpp Modified: llvm/tags/Apple/llvmCore-2061/lib/Transforms/Scalar/InstructionCombining.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/lib/Transforms/Scalar/InstructionCombining.cpp?rev=54419&r1=54418&r2=54419&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2061/lib/Transforms/Scalar/InstructionCombining.cpp (original) +++ llvm/tags/Apple/llvmCore-2061/lib/Transforms/Scalar/InstructionCombining.cpp Wed Aug 6 13:35:31 2008 @@ -11215,11 +11215,13 @@ Elts.push_back(UndefValue::get(Type::Int32Ty)); else { if ((Mask[i] >= e && isa(RHS)) \|\| - (Mask[i] < e && isa(LHS))) + (Mask[i] < e && isa(LHS))) { Mask[i] = 2e; // Turn into undef. - else + Elts.push_back(UndefValue::get(Type::Int32Ty)); + } else { Mask[i] &= (e-1); // Force to LHS. - Elts.push_back(ConstantInt::get(Type::Int32Ty, Mask[i])); + Elts.push_back(ConstantInt::get(Type::Int32Ty, Mask[i])); + } } } SVI.setOperand(0, SVI.getOperand(1)); Added: llvm/tags/Apple/llvmCore-2061/test/Transforms/InstCombine/shufflemask-undef.ll URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2061/test/Transforms/InstCombine/shufflemask-undef.ll?rev=54419&view=auto ============================================================================== --- llvm/tags/Apple/llvmCore-2061/test/Transforms/InstCombine/shufflemask-undef.ll (added) +++ llvm/tags/Apple/llvmCore-2061/test/Transforms/InstCombine/shufflemask-undef.ll Wed Aug 6 13:35:31 2008 @@ -0,0 +1,109 @@ +; RUN: llvm-as < %s \| opt -instcombine \| llvm-dis \| not grep {shufflevector.\i32 8} + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:128:128" +target triple = "i386-apple-darwin9" + %struct.ActiveTextureTargets = type { i64, i64, i64, i64, i64, i64 } + %struct.AlphaTest = type { float, i16, i8, i8 } + %struct.ArrayRange = type { i8, i8, i8, i8 } + %struct.BlendMode = type { i16, i16, i16, i16, %struct.IColor4, i16, i16, i8, i8, i8, i8 } + %struct.ClearColor = type { double, %struct.IColor4, %struct.IColor4, float, i32 } + %struct.ClipPlane = type { i32, [6 x %struct.IColor4] } + %struct.ColorBuffer = type { i16, i8, i8, [8 x i16], [0 x i32] } + %struct.ColorMatrix = type { [16 x float], %struct.ImagingColorScale } + %struct.Convolution = type { %struct.IColor4, %struct.ImagingColorScale, i16, i16, [0 x i32], float, i32, i32 } + %struct.DepthTest = type { i16, i16, i8, i8, i8, i8, double, double } + %struct.FixedFunction = type { %struct.PPStreamToken* } + %struct.FogMode = type { %struct.IColor4, float, float, float, float, float, i16, i16, i16, i8, i8 } + %struct.HintMode = type { i16, i16, i16, i16, i16, i16, i16, i16, i16, i16 } + %struct.Histogram = type { %struct.ProgramLimits, i32, i16, i8, i8 } + %struct.ImagingColorScale = type { %struct.TCoord2, %struct.TCoord2, %struct.TCoord2, %struct.TCoord2 } + %struct.ImagingSubset = type { %struct.Convolution, %struct.Convolution, %struct.Convolution, %struct.ColorMatrix, %struct.Minmax, %struct.Histogram, %struct.ImagingColorScale, %struct.ImagingColorScale, %struct.ImagingColorScale, %struct.ImagingColorScale, i32, [0 x i32] } + %struct.Light = type { %struct.IColor4, %struct.IColor4, %struct.IColor4, %struct.IColor4, %struct.PointLineLimits, float, float, float, float, float, %struct.PointLineLimits, float, %struct.PointLineLimits, float, %struct.PointLineLimits, float, float, float, float, float } + %struct.LightModel = type { %struct.IColor4, [8 x %struct.Light], [2 x %struct.Material], i32, i16, i16, i16, i8, i8, i8, i8, i8, i8 } + %struct.LightProduct = type { %struct.IColor4, %struct.IColor4, %struct.IColor4 } + %struct.LineMode = type { float, i32, i16, i16, i8, i8, i8, i8 } + %struct.LogicOp = type { i16, i8, i8 } + %struct.MaskMode = type { i32, [3 x i32], i8, i8, i8, i8, i8, i8, i8, i8 } + %struct.Material = type { %struct.IColor4, %struct.IColor4, %struct.IColor4, %struct.IColor4, float, float, float, float, [8 x %struct.LightProduct], %struct.IColor4, [8 x i32] } + %struct.Minmax = type { %struct.MinmaxTable, i16, i8, i8, [0 x i32] } + %struct.MinmaxTable = type { %struct.IColor4, %struct.IColor4 } + %struct.Mipmaplevel = type { [4 x i32], [4 x i32], [4 x float], [4 x i32], i32, i32, float, i8, i16, i16, i16, i16, [2 x float] } + %struct.Multisample = type { float, i8, i8, i8, i8, i8, i8, i8, i8 } + %struct.PipelineProgramState = type { i8, i8, i8, i8, [0 x i32], %struct.IColor4* } + %struct.PixelMap = type { i32, float, float, float, float, float, float, float, float, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i32 } + %struct.PixelMode = type { float, float, %struct.PixelStore, %struct.PixelTransfer, %struct.PixelMap, %struct.ImagingSubset, i32, i32 } + %struct.PixelPack = type { i32, i32, i32, i32, i32, i32, i32, i32, i8, i8, i8, i8 } + %struct.PixelStore = type { %struct.PixelPack, %struct.PixelPack } + %struct.PixelTransfer = type { float, float, float, float, float, float, float, float, float, float, i32, i32, float, float, float, float, float, float, float, float, float, float, float, float } + %struct.PluginBufferData = type { i32 } + %struct.PointLineLimits = type { float, float, float } + %struct.PointMode = type { float, float, float, float, %struct.PointLineLimits, float, i8, i8, i8, i8, i16, i16, i32, i16, i16 } + %struct.PolygonMode = type { [128 x i8], float, float, i16, i16, i16, i16, i8, i8, i8, i8, i8, i8, i8, i8 } + %struct.ProgramLimits = type { i32, i32, i32, i32 } + %struct.RegisterCombiners = type { i8, i8, i8, i8, i32, [2 x %struct.IColor4], [8 x %struct.RegisterCombinersPerStageState], %struct.RegisterCombinersFinalStageState } + %struct.RegisterCombinersFinalStageState = type { i8, i8, i8, i8, [7 x %struct.RegisterCombinersPerVariableState] } + %struct.RegisterCombinersPerPortionState = type { [4 x %struct.RegisterCombinersPerVariableState], i8, i8, i8, i8, i16, i16, i16, i16, i16, i16 } + %struct.RegisterCombinersPerStageState = type { [2 x %struct.RegisterCombinersPerPortionState], [2 x %struct.IColor4] } + %struct.RegisterCombinersPerVariableState = type { i16, i16, i16, i16 } + %struct.SWRSurfaceRec = type { i32, i32, i32, i32, i32, i32, i32, i32, i32, i32, i8, i8, i8, [4 x i8], i32 } + %struct.ScissorTest = type { %struct.ProgramLimits, i8, i8, i8, i8 } + %struct.State = type <{ i16, i16, i16, i16, i32, i32, [256 x %struct.IColor4], [128 x %struct.IColor4], %struct.Viewport, %struct.Transform, %struct.LightModel, %struct.ActiveTextureTargets, %struct.AlphaTest, %struct.BlendMode, %struct.ClearColor, %struct.ColorBuffer, %struct.DepthTest, %struct.ArrayRange, %struct.FogMode, %struct.HintMode, %struct.LineMode, %struct.LogicOp, %struct.MaskMode, %struct.PixelMode, %struct.PointMode, %struct.PolygonMode, %struct.ScissorTest, i32, %struct.StencilTest, [8 x %struct.TextureMode], [16 x %struct.TextureImageMode], %struct.ArrayRange, [8 x %struct.TextureCoordGen], %struct.ClipPlane, %struct.Multisample, %struct.RegisterCombiners, %struct.ArrayRange, %struct.ArrayRange, [3 x %struct.PipelineProgramState], %struct.ArrayRange, %struct.TransformFeedback, i32, %struct.FixedFunction, [3 x i32], [3 x i32] }> + %struct.StencilTest = type { [3 x { i32, i32, i16, i16, i16, i16 }], i32, [4 x i8] } + %struct.TextureCoordGen = type { { i16, i16, %struct.IColor4, %struct.IColor4 }, { i16, i16, %struct.IColor4, %struct.IColor4 }, { i16, i16, %struct.IColor4, %struct.IColor4 }, { i16, i16, %struct.IColor4, %struct.IColor4 }, i8, i8, i8, i8 } + %struct.TextureGeomState = type { i16, i16, i16, i16, i16, i8, i8, i8, i8, i16, i16, i16, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, i8, [6 x i16], [6 x i16] } + %struct.TextureImageMode = type { float } + %struct.TextureLevel = type { i32, i32, i16, i16, i16, i8, i8, i16, i16, i16, i16, i8 } + %struct.TextureMode = type { %struct.IColor4, i32, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, i16, float, float, i16, i16, i16, i16, i16, i16, [4 x i16], i8, i8, i8, i8, [3 x float], [4 x float], float, float } + %struct.TextureParamState = type { i16, i16, i16, i16, i16, i16, %struct.IColor4, float, float, float, float, i16, i16, i16, i16, float, i16, i8, i8, i32, i8* } + %struct.TextureRec = type { [4 x float], %struct.TextureState, %struct.Mipmaplevel, %struct.Mipmaplevel, float, float, float, float, i8, i8, i8, i8, i16, i16, i16, i16, i32, float, [2 x %struct.PPStreamToken] } + %struct.TextureState = type { i16, i8, i8, i16, i16, float, i32, %struct.SWRSurfaceRec, %struct.TextureParamState, %struct.TextureGeomState, [0 x i32], i8, i32, %struct.TextureLevel, [1 x [15 x %struct.TextureLevel]] } + %struct.Transform = type <{ [24 x [16 x float]], [24 x [16 x float]], [16 x float], float, float, float, float, float, i8, i8, i8, i8, i32, i32, i32, i16, i16, i8, i8, i8, i8, i32 }> + %struct.TransformFeedback = type { i8, i8, i8, i8, [0 x i32], [16 x i32], [16 x i32] } + %struct.Viewport = type { float, float, float, float, float, float, float, float, float, float, float, float, float, float, float, float, double, double, i32, i32, i32, i32, float, float, float, float } + %struct.IColor4 = type { float, float, float, float } + %struct.TCoord2 = type { float, float } + %struct.VMGPStack = type { [6 x <4 x float>], <4 x float>, i32, i32, <4 x float>, <4 x float>*, i32, i32, i32, i32, i32, i32 } + %struct.VMTextures = type { [16 x %struct.TextureRec] } + %struct.PPStreamToken = type { { i16, i16, i32 } } + %struct._VMConstants = type { <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, <4 x float>, float, float, float, float, float, float, float, float, float, float, float, float, [256 x float], [528 x i8], { void (i8, i8, i32, i8), float (float), float (float), float (float), i32 (float) } } + +define i32 @foo(%struct.State* %dst, <4 x float>* %prgrm, <4 x float>** %buffs, %struct._VMConstants* %cnstn, %struct.PPStreamToken* %pstrm, %struct.PluginBufferData* %gpctx, %struct.VMTextures* %txtrs, %struct.VMGPStack* %gpstk) nounwind { +bb266.i: + getelementptr <4 x float>* null, i32 11 ; <<4 x float>>:0 [#uses=1] + load <4 x float> %0, align 16 ; <<4 x float>>:1 [#uses=1] + shufflevector <4 x float> %1, <4 x float> undef, <4 x i32> < i32 0, i32 1, i32 1, i32 1 > ; <<4 x float>>:2 [#uses=1] + shufflevector <4 x float> %2, <4 x float> undef, <4 x i32> < i32 0, i32 4, i32 1, i32 5 > ; <<4 x float>>:3 [#uses=1] + shufflevector <4 x float> undef, <4 x float> undef, <4 x i32> < i32 0, i32 4, i32 1, i32 5 > ; <<4 x float>>:4 [#uses=1] + shufflevector <4 x float> %4, <4 x float> %3, <4 x i32> < i32 6, i32 7, i32 2, i32 3 > ; <<4 x float>>:5 [#uses=1] + mul <4 x float> %5, zeroinitializer ; <<4 x float>>:6 [#uses=2] + mul <4 x float> %6, %6 ; <<4 x float>>:7 [#uses=1] + add <4 x float> zeroinitializer, %7 ; <<4 x float>>:8 [#uses=1] + call <4 x float> @llvm.x86.sse.max.ps( <4 x float> zeroinitializer, <4 x float> %8 ) nounwind readnone ; <<4 x float>>:9 [#uses=1] + %phitmp40 = bitcast <4 x float> %9 to <4 x i32> ; <<4 x i32>> [#uses=1] + %tmp4109.i = and <4 x i32> %phitmp40, < i32 8388607, i32 8388607, i32 8388607, i32 8388607 > ; <<4 x i32>> [#uses=1] + %tmp4116.i = or <4 x i32> %tmp4109.i, < i32 1065353216, i32 1065353216, i32 1065353216, i32 1065353216 > ; <<4 x i32>> [#uses=1] + %tmp4117.i = bitcast <4 x i32> %tmp4116.i to <4 x float> ; <<4 x float>> [#uses=1] + add <4 x float> %tmp4117.i, zeroinitializer ; <<4 x float>>:10 [#uses=1] + mul <4 x float> %10, < float 5.000000e-01, float 5.000000e-01, float 5.000000e-01, float 5.000000e-01 > ; <<4 x float>>:11 [#uses=1] + call <4 x float> @llvm.x86.sse.max.ps( <4 x float> %11, <4 x float> zeroinitializer ) nounwind readnone ; <<4 x float>>:12 [#uses=1] + call <4 x float> @llvm.x86.sse.min.ps( <4 x float> %12, <4 x float> zeroinitializer ) nounwind readnone ; <<4 x float>>:13 [#uses=1] + %tmp4170.i = call <4 x float> @llvm.x86.sse.cmp.ps( <4 x float> %13, <4 x float> zeroinitializer, i8 2 ) nounwind ; <<4 x float>> [#uses=1] + bitcast <4 x float> %tmp4170.i to <16 x i8> ; <<16 x i8>>:14 [#uses=1] + call i32 @llvm.x86.sse2.pmovmskb.128( <16 x i8> %14 ) nounwind readnone ; :15 [#uses=1] + icmp eq i32 %15, 0 ; :16 [#uses=1] + br i1 %16, label %bb5574.i, label %bb4521.i + +bb4521.i: ; preds = %bb266.i + unreachable + +bb5574.i: ; preds = %bb266.i + unreachable +} + +declare <4 x float> @llvm.x86.sse.cmp.ps(<4 x float>, <4 x float>, i8) nounwind readnone + +declare i32 @llvm.x86.sse2.pmovmskb.128(<16 x i8>) nounwind readnone + +declare <4 x float> @llvm.x86.sse.max.ps(<4 x float>, <4 x float>) nounwind readnone + +declare <4 x float> @llvm.x86.sse.min.ps(<4 x float>, <4 x float>) nounwind readnone From resistor at mac.com Wed Aug 6 13:35:45 2008 From: resistor at mac.com (Owen Anderson) Date: Wed, 06 Aug 2008 18:35:45 -0000 Subject: [llvm-commits] [llvm] r54420 - /llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Message-ID: <200808061835.m76IZjVm018460@zion.cs.uiuc.edu> Author: resistor Date: Wed Aug 6 13:35:45 2008 New Revision: 54420 URL: http://llvm.org/viewvc/llvm-project?rev=54420&view=rev Log: Only remap each VNInfo once when doing renumbering. Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=54420&r1=54419&r2=54420&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Wed Aug 6 13:35:45 2008 @@ -64,8 +64,6 @@ AU.addRequired(); AU.addPreservedID(MachineLoopInfoID); AU.addPreservedID(MachineDominatorsID); - AU.addPreservedID(PHIEliminationID); - AU.addRequiredID(PHIEliminationID); AU.addRequiredID(TwoAddressInstructionPassID); MachineFunctionPass::getAnalysisUsage(AU); } @@ -129,7 +127,7 @@ std::sort(Idx2MBBMap.begin(), Idx2MBBMap.end(), Idx2MBBCompare()); if (!OldI2MI.empty()) - for (iterator OI = begin(), OE = end(); OI != OE; ++OI) + for (iterator OI = begin(), OE = end(); OI != OE; ++OI) { for (LiveInterval::iterator LI = OI->second.begin(), LE = OI->second.end(); LI != LE; ++LI) { @@ -172,15 +170,18 @@ else LI->end = InstrSlots::NUM * i2miMap_.size(); } + } + + for (LiveInterval::vni_iterator VNI = OI->second.vni_begin(), + VNE = OI->second.vni_end(); VNI != VNE; ++VNI) { + VNInfo* vni = VNI; // Remap the VNInfo def index, which works the same as the - // start indices above. - VNInfo vni = LI->valno; - - // VN's with special sentinel defs don't need to be remapped. + // start indices above. VN's with special sentinel defs + // don't need to be remapped. if (vni->def != ~0U && vni->def != ~1U) { - index = vni->def / InstrSlots::NUM; - offset = vni->def % InstrSlots::NUM; + unsigned index = vni->def / InstrSlots::NUM; + unsigned offset = vni->def % InstrSlots::NUM; if (offset == InstrSlots::LOAD) { std::vector::const_iterator I = std::lower_bound(OldI2MBB.begin(), OldI2MBB.end(), vni->def); @@ -200,14 +201,14 @@ // PHI kills don't need to be remapped. if (!vni->kills[i]) continue; - index = (vni->kills[i]-1) / InstrSlots::NUM; - offset = vni->kills[i] % InstrSlots::NUM; - if (offset == InstrSlots::LOAD) { + unsigned index = (vni->kills[i]-1) / InstrSlots::NUM; + unsigned offset = vni->kills[i] % InstrSlots::NUM; + if (offset == InstrSlots::STORE) { std::vector::const_iterator I = std::lower_bound(OldI2MBB.begin(), OldI2MBB.end(), vni->kills[i]); --I; - vni->kills[i] = getMBBEndIdx(I->second) + 1; + vni->kills[i] = getMBBEndIdx(I->second); } else { unsigned idx = index; while (index < OldI2MI.size() && !OldI2MI[index]) ++index; @@ -220,6 +221,7 @@ } } } + } } /// runOnMachineFunction - Register allocate the whole function From resistor at mac.com Wed Aug 6 13:36:18 2008 From: resistor at mac.com (Owen Anderson) Date: Wed, 06 Aug 2008 18:36:18 -0000 Subject: [llvm-commits] [llvm] r54421 - /llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Message-ID: <200808061836.m76IaI3Q018483@zion.cs.uiuc.edu> Author: resistor Date: Wed Aug 6 13:36:17 2008 New Revision: 54421 URL: http://llvm.org/viewvc/llvm-project?rev=54421&view=rev Log: Only trim a live interval if the register is not used after the PHI node. Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=54421&r1=54420&r2=54421&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original) +++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Wed Aug 6 13:36:17 2008 @@ -896,13 +896,16 @@ } } else { // Trim live intervals of input registers. They are no longer live into - // this block. + // this block if they died after the PHI. If they lived after it, don't + // trim them because they might have other legitimate uses. for (unsigned i = 1; i < PInstr->getNumOperands(); i += 2) { unsigned reg = PInstr->getOperand(i).getReg(); MachineBasicBlock* MBB = PInstr->getOperand(i+1).getMBB(); LiveInterval& InputI = LI.getInterval(reg); if (MBB != PInstr->getParent() && - InputI.liveAt(LI.getMBBStartIdx(PInstr->getParent()))) + InputI.liveAt(LI.getMBBStartIdx(PInstr->getParent())) && + InputI.expiredAt(LI.getInstructionIndex(PInstr) + + LiveIntervals::InstrSlots::NUM)) InputI.removeRange(LI.getMBBStartIdx(PInstr->getParent()), LI.getInstructionIndex(PInstr), true); From baldrick at free.fr Wed Aug 6 15:25:35 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 6 Aug 2008 22:25:35 +0200 Subject: [llvm-commits] SoftenFloatOp support for fp_round In-Reply-To: <275e64e40808040938g29a4b1b6j87c85abaaf557e96@mail.gmail.com> References: <275e64e40807161139x699f650cx816bf9947e5b0ae9@mail.gmail.com> <200808040924.31674.baldrick@free.fr> <275e64e40808040938g29a4b1b6j87c85abaaf557e96@mail.gmail.com> Message-ID: <200808062225.35791.baldrick@free.fr> Hi Bruno, > Done. The new patch contain the changes. + unsigned Size = NVT.getSizeInBits(); + + // Mask = ~(1 << SizeInBits) The comment should say ~(1 << (Size-1)) + SDValue Mask = DAG.getConstant(APInt::getMaxValue(Size).clear(Size-1), NVT); I think it's clearer to use getAllOnesValue rather than getMaxValue. + SDValue Lo = GetSoftenedFloat(N->getOperand(0)); Not sure why this is called "Lo". How about Op? > Ok to commit? Yes, with the above tweaks. Thanks for doing this, Duncan. From resistor at mac.com Wed Aug 6 15:29:21 2008 From: resistor at mac.com (Owen Anderson) Date: Wed, 06 Aug 2008 20:29:21 -0000 Subject: [llvm-commits] [llvm] r54422 - /llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Message-ID: <200808062029.m76KTLEF021771@zion.cs.uiuc.edu> Author: resistor Date: Wed Aug 6 15:29:20 2008 New Revision: 54422 URL: http://llvm.org/viewvc/llvm-project?rev=54422&view=rev Log: We don't need to try to coalesce input vregs that are the same as the output vreg. Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=54422&r1=54421&r2=54422&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original) +++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Wed Aug 6 15:29:20 2008 @@ -421,6 +421,7 @@ while (P != MBB->end() && P->getOpcode() == TargetInstrInfo::PHI) { unsigned DestReg = P->getOperand(0).getReg(); + // Don't both doing PHI elimination for dead PHI's. if (P->registerDefIsDead(DestReg)) { ++P; @@ -442,6 +443,12 @@ // Iterate over the operands of the PHI node for (int i = P->getNumOperands() - 1; i >= 2; i-=2) { unsigned SrcReg = P->getOperand(i-1).getReg(); + + // Don't need to try to coalesce a register with itself. + if (SrcReg == DestReg) { + ProcessedNames.insert(SrcReg); + continue; + } // Check for trivial interferences via liveness information, allowing us // to avoid extra work later. Any registers that interfere cannot both From baldrick at free.fr Wed Aug 6 15:43:15 2008 From: baldrick at free.fr (Duncan Sands) Date: Wed, 6 Aug 2008 22:43:15 +0200 Subject: [llvm-commits] [llvm-gcc-4.2] r54327 - in /llvm-gcc-4.2/trunk/libcpp: ChangeLog.apple charset.c In-Reply-To: <200808042005.m74K5VhN025172@zion.cs.uiuc.edu> References: <200808042005.m74K5VhN025172@zion.cs.uiuc.edu> Message-ID: <200808062243.15576.baldrick@free.fr> Hi Bill, > Make sure we don't read before the buffer. did you come to a conclusion about whether st_size = to.len; (a few lines later) is correct, or whether it should be st_size = to.len + 1; (since an extra character was appended to the buffer)? Thanks, Duncan. From isanbard at gmail.com Wed Aug 6 15:52:42 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 6 Aug 2008 13:52:42 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54327 - in /llvm-gcc-4.2/trunk/libcpp: ChangeLog.apple charset.c In-Reply-To: <200808062243.15576.baldrick@free.fr> References: <200808042005.m74K5VhN025172@zion.cs.uiuc.edu> <200808062243.15576.baldrick@free.fr> Message-ID: <16e5fdf90808061352i7f5c6a40v5ee120a1da706d84@mail.gmail.com> On Wed, Aug 6, 2008 at 1:43 PM, Duncan Sands wrote: > Hi Bill, > >> Make sure we don't read before the buffer. > > did you come to a conclusion about whether > st_size = to.len; > (a few lines later) is correct, or whether > it should be > st_size = to.len + 1; > (since an extra character was appended to > the buffer)? > I checked with the guy here at the office who knows this stuff (Mike Stump). Here's his response: "Can't imagine why that would be good. If one has 20 characters before, they tend to have 20 characters after... They have a testcase that shows improved behavior?" I'm not sure exactly what to do in this situation, or what the code expects down the line. If the code has been there for awhile, I would err on the side of caution and just keep it like it is. What do you think? -bw From kremenek at apple.com Wed Aug 6 15:57:07 2008 From: kremenek at apple.com (Ted Kremenek) Date: Wed, 06 Aug 2008 20:57:07 -0000 Subject: [llvm-commits] [llvm] r54424 - /llvm/trunk/win32/clang.sln Message-ID: <200808062057.m76Kv7Yv022539@zion.cs.uiuc.edu> Author: kremenek Date: Wed Aug 6 15:57:07 2008 New Revision: 54424 URL: http://llvm.org/viewvc/llvm-project?rev=54424&view=rev Log: Add libDriver.vcproj to solution file. Modified: llvm/trunk/win32/clang.sln Modified: llvm/trunk/win32/clang.sln URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/clang.sln?rev=54424&r1=54423&r2=54424&view=diff ============================================================================== --- llvm/trunk/win32/clang.sln (original) +++ llvm/trunk/win32/clang.sln Wed Aug 6 15:57:07 2008 @@ -265,7 +265,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangDriver", "..\tools\clang\win32\clangDriver\clangDriver.vcproj", "{7E7DA455-C276-4B93-8D02-8F7E2F629BAF}" ProjectSection(ProjectDependencies) = postProject {030F6909-B2FA-4E53-BEA7-9A559CFC2F73} = {030F6909-B2FA-4E53-BEA7-9A559CFC2F73} - {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} = {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} = {0F8407F3-FA23-4CF1-83A9-DCBE0B361489} {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD} = {5125C3DB-FBD6-4BF8-8D8B-CE51D6E93BCD} {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} = {45CD78D7-C5D9-47FE-AD12-F3251EEDAFFB} @@ -278,6 +278,7 @@ {05DF3074-11AF-491A-B078-83BD2EDC31F6} = {05DF3074-11AF-491A-B078-83BD2EDC31F6} {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} = {F1EFF064-8869-4DFF-8E1A-CD8F4A5F8D62} {28AA9146-3482-4F41-9CC6-407B1D258508} = {28AA9146-3482-4F41-9CC6-407B1D258508} + {0622E827-8464-489D-8B1C-B0B496F35C08} = {0622E827-8464-489D-8B1C-B0B496F35C08} {6C98551A-4C36-4E74-8419-4D3EEEC9D8E0} = {6C98551A-4C36-4E74-8419-4D3EEEC9D8E0} EndProjectSection EndProject @@ -287,6 +288,8 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangRewrite", "..\tools\clang\win32\clangRewrite\clangRewrite.vcproj", "{F9FBDDA2-9EE1-473C-A456-BE20B7B2439D}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "clangLibDriver", "..\tools\clang\win32\clangLibDriver\clangLibDriver.vcproj", "{AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Configure\|Win32 = Configure\|Win32 @@ -528,6 +531,12 @@ {F9FBDDA2-9EE1-473C-A456-BE20B7B2439D}.Debug\|Win32.Build.0 = Debug\|Win32 {F9FBDDA2-9EE1-473C-A456-BE20B7B2439D}.Release\|Win32.ActiveCfg = Release\|Win32 {F9FBDDA2-9EE1-473C-A456-BE20B7B2439D}.Release\|Win32.Build.0 = Release\|Win32 + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}.Configure\|Win32.ActiveCfg = Release\|Win32 + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}.Configure\|Win32.Build.0 = Release\|Win32 + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}.Debug\|Win32.ActiveCfg = Debug\|Win32 + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}.Debug\|Win32.Build.0 = Debug\|Win32 + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}.Release\|Win32.ActiveCfg = Release\|Win32 + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4}.Release\|Win32.Build.0 = Release\|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -572,6 +581,7 @@ {298B4876-6EF1-4E80-85D7-72F80693BBEB} = {DAC2AB11-F09C-454B-86FD-9BDBBA25827F} {6C98551A-4C36-4E74-8419-4D3EEEC9D8E0} = {DAC2AB11-F09C-454B-86FD-9BDBBA25827F} {F9FBDDA2-9EE1-473C-A456-BE20B7B2439D} = {DAC2AB11-F09C-454B-86FD-9BDBBA25827F} + {AECB78DF-C319-4D49-B2FD-F98F62EBBDF4} = {DAC2AB11-F09C-454B-86FD-9BDBBA25827F} EndGlobalSection GlobalSection(DPCodeReviewSolutionGUID) = preSolution DPCodeReviewSolutionGUID = {00000000-0000-0000-0000-000000000000} From resistor at mac.com Wed Aug 6 15:58:38 2008 From: resistor at mac.com (Owen Anderson) Date: Wed, 06 Aug 2008 20:58:38 -0000 Subject: [llvm-commits] [llvm] r54425 - /llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Message-ID: <200808062058.m76Kwdff022602@zion.cs.uiuc.edu> Author: resistor Date: Wed Aug 6 15:58:38 2008 New Revision: 54425 URL: http://llvm.org/viewvc/llvm-project?rev=54425&view=rev Log: Oops, didn't mean to commit this. Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Modified: llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp?rev=54425&r1=54424&r2=54425&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp (original) +++ llvm/trunk/lib/CodeGen/LiveIntervalAnalysis.cpp Wed Aug 6 15:58:38 2008 @@ -64,6 +64,8 @@ AU.addRequired(); AU.addPreservedID(MachineLoopInfoID); AU.addPreservedID(MachineDominatorsID); + AU.addPreservedID(PHIEliminationID); + AU.addRequiredID(PHIEliminationID); AU.addRequiredID(TwoAddressInstructionPassID); MachineFunctionPass::getAnalysisUsage(AU); } From lattner at apple.com Wed Aug 6 16:05:04 2008 From: lattner at apple.com (Tanya Lattner) Date: Wed, 6 Aug 2008 14:05:04 -0700 Subject: [llvm-commits] Test mail Message-ID: Testing mailing list, please ignore. -Tanya From resistor at mac.com Wed Aug 6 17:08:59 2008 From: resistor at mac.com (Owen Anderson) Date: Wed, 06 Aug 2008 22:08:59 -0000 Subject: [llvm-commits] [llvm] r54426 - /llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Message-ID: <200808062208.m76M8xmR025046@zion.cs.uiuc.edu> Author: resistor Date: Wed Aug 6 17:08:58 2008 New Revision: 54426 URL: http://llvm.org/viewvc/llvm-project?rev=54426&view=rev Log: Correct handle cases where two phis are coalesced together, and correct break up the case where two different phis want to coalesce with the same vreg. Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=54426&r1=54425&r2=54426&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original) +++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Wed Aug 6 17:08:58 2008 @@ -860,20 +860,52 @@ I->begin()->getOpcode() == TargetInstrInfo::PHI) processBlock(I); + // Break interferences where two different phis want to coalesce + // in the same register. + std::set seen; + typedef std::map > + RenameSetType; + for (RenameSetType::iterator I = RenameSets.begin(), E = RenameSets.end(); + I != E; ++I) { + for (std::map::iterator + OI = I->second.begin(), OE = I->second.end(); OI != OE; ) { + if (!seen.count(OI->first)) { + seen.insert(OI->first); + ++OI; + } else { + Waiting[OI->second].insert(std::make_pair(OI->first, I->first)); + unsigned reg = OI->first; + ++OI; + I->second.erase(reg); + } + } + } + // Insert copies // FIXME: This process should probably preserve LiveIntervals SmallPtrSet visited; InsertCopies(Fn.begin(), visited); // Perform renaming - typedef std::map > - RenameSetType; for (RenameSetType::iterator I = RenameSets.begin(), E = RenameSets.end(); I != E; ++I) - for (std::map::iterator SI = - I->second.begin(), SE = I->second.end(); SI != SE; ++SI) { - mergeLiveIntervals(I->first, SI->first, SI->second); - Fn.getRegInfo().replaceRegWith(SI->first, I->first); + while (I->second.size()) { + std::map::iterator SI = I->second.begin(); + + if (SI->first != I->first) { + mergeLiveIntervals(I->first, SI->first, SI->second); + Fn.getRegInfo().replaceRegWith(SI->first, I->first); + + if (RenameSets.count(SI->first)) { + I->second.insert(RenameSets[SI->first].begin(), + RenameSets[SI->first].end()); + RenameSets.erase(SI->first); + } + + + } + + I->second.erase(SI->first); } // FIXME: Insert last-minute copies @@ -907,6 +939,7 @@ // trim them because they might have other legitimate uses. for (unsigned i = 1; i < PInstr->getNumOperands(); i += 2) { unsigned reg = PInstr->getOperand(i).getReg(); + MachineBasicBlock* MBB = PInstr->getOperand(i+1).getMBB(); LiveInterval& InputI = LI.getInterval(reg); if (MBB != PInstr->getParent() && From isanbard at gmail.com Wed Aug 6 17:17:24 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 22:17:24 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54427 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200808062217.m76MHOk6025279@zion.cs.uiuc.edu> Author: void Date: Wed Aug 6 17:17:23 2008 New Revision: 54427 URL: http://llvm.org/viewvc/llvm-project?rev=54427&view=rev Log: r50318 looks like it never made it into mainline: Initialize padding bytes. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54427&r1=54426&r2=54427&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Wed Aug 6 17:17:23 2008 @@ -6687,6 +6687,8 @@ Constant TreeConstantToLLVM::ConvertRecordCONSTRUCTOR(tree exp) { const StructType STy = cast(ConvertType(TREE_TYPE(exp))); + + bool OneEltIsUnion = false; std::vector ResultElts; ResultElts.resize(STy->getNumElements()); @@ -6706,6 +6708,9 @@ } } + if (TREE_CODE(TREE_TYPE(elt_value)) == UNION_TYPE) + OneEltIsUnion = true; + // Decode the field's value. Constant Val = Convert(elt_value); @@ -6746,9 +6751,30 @@ } // Fill in null elements with zeros. + unsigned InitSize = 0; for (unsigned i = 0, e = ResultElts.size(); i != e; ++i) { if (ResultElts[i] == 0) ResultElts[i] = Constant::getNullValue(STy->getElementType(i)); + + InitSize += getTargetData().getABITypeSize(ResultElts[i]->getType()); + } + + // If the struct has a fixed size, and if one the union value we converted + // isn't large enough to fill all the bits, add a zero initialized array at + // the end to pad it out. + tree StructType = TREE_TYPE(exp); + if (OneEltIsUnion && + TYPE_SIZE(StructType) && TREE_CODE(TYPE_SIZE(StructType)) == INTEGER_CST) { + unsigned StructSize = ((unsigned)TREE_INT_CST_LOW(TYPE_SIZE(TREE_TYPE(exp)))+7)/8; + if (StructSize != InitSize) { + const Type FillTy; + assert(StructSize > InitSize && "Init shouldn't be larger than struct!"); + if (StructSize - InitSize == 1) + FillTy = Type::Int8Ty; + else + FillTy = ArrayType::get(Type::Int8Ty, StructSize - InitSize); + ResultElts.push_back(Constant::getNullValue(FillTy)); + } } return ConstantStruct::get(ResultElts, STy->isPacked()); From dalej at apple.com Wed Aug 6 17:53:18 2008 From: dalej at apple.com (Dale Johannesen) Date: Wed, 6 Aug 2008 15:53:18 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54427 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200808062217.m76MHOk6025279@zion.cs.uiuc.edu> References: <200808062217.m76MHOk6025279@zion.cs.uiuc.edu> Message-ID: <8BEB71B8-9B08-4FD2-9BE5-A17BDE991958@apple.com> On Aug 6, 2008, at 3:17 PMPDT, Bill Wendling wrote: > Author: void > Date: Wed Aug 6 17:17:23 2008 > New Revision: 54427 > > URL: http://llvm.org/viewvc/llvm-project?rev=54427&view=rev > Log: > r50318 looks like it never made it into mainline: It was reverted later. Leave it alone. > > Initialize padding bytes. > > Modified: > llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp > > Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54427&r1=54426&r2=54427&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) > +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Wed Aug 6 17:17:23 2008 > @@ -6687,6 +6687,8 @@ > > Constant TreeConstantToLLVM::ConvertRecordCONSTRUCTOR(tree exp) { > const StructType STy = > cast(ConvertType(TREE_TYPE(exp))); > + > + bool OneEltIsUnion = false; > std::vector ResultElts; > ResultElts.resize(STy->getNumElements()); > > @@ -6706,6 +6708,9 @@ > } > } > > + if (TREE_CODE(TREE_TYPE(elt_value)) == UNION_TYPE) > + OneEltIsUnion = true; > + > // Decode the field's value. > Constant Val = Convert(elt_value); > > @@ -6746,9 +6751,30 @@ > } > > // Fill in null elements with zeros. > + unsigned InitSize = 0; > for (unsigned i = 0, e = ResultElts.size(); i != e; ++i) { > if (ResultElts[i] == 0) > ResultElts[i] = Constant::getNullValue(STy->getElementType(i)); > + > + InitSize += getTargetData().getABITypeSize(ResultElts[i]- > >getType()); > + } > + > + // If the struct has a fixed size, and if one the union value we > converted > + // isn't large enough to fill all the bits, add a zero > initialized array at > + // the end to pad it out. > + tree StructType = TREE_TYPE(exp); > + if (OneEltIsUnion && > + TYPE_SIZE(StructType) && TREE_CODE(TYPE_SIZE(StructType)) == > INTEGER_CST) { > + unsigned StructSize = > ((unsigned)TREE_INT_CST_LOW(TYPE_SIZE(TREE_TYPE(exp)))+7)/8; > + if (StructSize != InitSize) { > + const Type FillTy; > + assert(StructSize > InitSize && "Init shouldn't be larger > than struct!"); > + if (StructSize - InitSize == 1) > + FillTy = Type::Int8Ty; > + else > + FillTy = ArrayType::get(Type::Int8Ty, StructSize - InitSize); > + ResultElts.push_back(Constant::getNullValue(FillTy)); > + } > } > > return ConstantStruct::get(ResultElts, STy->isPacked()); > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From isanbard at gmail.com Wed Aug 6 17:57:12 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 06 Aug 2008 22:57:12 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54430 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200808062257.m76MvDqd026599@zion.cs.uiuc.edu> Author: void Date: Wed Aug 6 17:57:07 2008 New Revision: 54430 URL: http://llvm.org/viewvc/llvm-project?rev=54430&view=rev Log: Revert r54427. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54430&r1=54429&r2=54430&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Wed Aug 6 17:57:07 2008 @@ -6687,8 +6687,6 @@ Constant TreeConstantToLLVM::ConvertRecordCONSTRUCTOR(tree exp) { const StructType STy = cast(ConvertType(TREE_TYPE(exp))); - - bool OneEltIsUnion = false; std::vector ResultElts; ResultElts.resize(STy->getNumElements()); @@ -6708,9 +6706,6 @@ } } - if (TREE_CODE(TREE_TYPE(elt_value)) == UNION_TYPE) - OneEltIsUnion = true; - // Decode the field's value. Constant Val = Convert(elt_value); @@ -6751,30 +6746,9 @@ } // Fill in null elements with zeros. - unsigned InitSize = 0; for (unsigned i = 0, e = ResultElts.size(); i != e; ++i) { if (ResultElts[i] == 0) ResultElts[i] = Constant::getNullValue(STy->getElementType(i)); - - InitSize += getTargetData().getABITypeSize(ResultElts[i]->getType()); - } - - // If the struct has a fixed size, and if one the union value we converted - // isn't large enough to fill all the bits, add a zero initialized array at - // the end to pad it out. - tree StructType = TREE_TYPE(exp); - if (OneEltIsUnion && - TYPE_SIZE(StructType) && TREE_CODE(TYPE_SIZE(StructType)) == INTEGER_CST) { - unsigned StructSize = ((unsigned)TREE_INT_CST_LOW(TYPE_SIZE(TREE_TYPE(exp)))+7)/8; - if (StructSize != InitSize) { - const Type FillTy; - assert(StructSize > InitSize && "Init shouldn't be larger than struct!"); - if (StructSize - InitSize == 1) - FillTy = Type::Int8Ty; - else - FillTy = ArrayType::get(Type::Int8Ty, StructSize - InitSize); - ResultElts.push_back(Constant::getNullValue(FillTy)); - } } return ConstantStruct::get(ResultElts, STy->isPacked()); From isanbard at gmail.com Wed Aug 6 17:58:05 2008 From: isanbard at gmail.com (Bill Wendling) Date: Wed, 6 Aug 2008 15:58:05 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54427 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <8BEB71B8-9B08-4FD2-9BE5-A17BDE991958@apple.com> References: <200808062217.m76MHOk6025279@zion.cs.uiuc.edu> <8BEB71B8-9B08-4FD2-9BE5-A17BDE991958@apple.com> Message-ID: <16e5fdf90808061558y6bf6c01dn938cdf815f16a16d@mail.gmail.com> On Wed, Aug 6, 2008 at 3:53 PM, Dale Johannesen wrote: > > On Aug 6, 2008, at 3:17 PMPDT, Bill Wendling wrote: > >> Author: void >> Date: Wed Aug 6 17:17:23 2008 >> New Revision: 54427 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=54427&view=rev >> Log: >> r50318 looks like it never made it into mainline: > > It was reverted later. Leave it alone. > Whatever. -bw From resistor at mac.com Wed Aug 6 18:16:52 2008 From: resistor at mac.com (Owen Anderson) Date: Wed, 06 Aug 2008 23:16:52 -0000 Subject: [llvm-commits] [llvm] r54432 - /llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Message-ID: <200808062316.m76NGqGL027165@zion.cs.uiuc.edu> Author: resistor Date: Wed Aug 6 18:16:52 2008 New Revision: 54432 URL: http://llvm.org/viewvc/llvm-project?rev=54432&view=rev Log: SDISel's constant branch folding can fold away self-loops, which doesn't result in any dead blocks, but rather an incorrect phi input. Add code to UnreachableMachineBlockElim to get rid of these entries. Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp?rev=54432&r1=54431&r2=54432&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp (original) +++ llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Wed Aug 6 18:16:52 2008 @@ -111,9 +111,11 @@ // Loop over all dead blocks, remembering them and deleting all instructions // in them. std::vector DeadBlocks; - for (MachineFunction::iterator I = F.begin(), E = F.end(); I != E; ++I) - if (!Reachable.count(I)) { - MachineBasicBlock BB = I; + for (MachineFunction::iterator I = F.begin(), E = F.end(); I != E; ++I) { + MachineBasicBlock BB = I; + + // Test for deadness. + if (!Reachable.count(BB)) { DeadBlocks.push_back(BB); while (BB->succ_begin() != BB->succ_end()) { @@ -129,28 +131,51 @@ start->RemoveOperand(i-1); } - if (start->getNumOperands() == 3) { - MachineInstr* phi = start; - unsigned Input = phi->getOperand(1).getReg(); - unsigned Output = phi->getOperand(0).getReg(); - - start++; - phi->eraseFromParent(); - - if (Input != Output) - F.getRegInfo().replaceRegWith(Output, Input); - } else - start++; + start++; } BB->removeSuccessor(BB->succ_begin()); } } + } // Actually remove the blocks now. for (unsigned i = 0, e = DeadBlocks.size(); i != e; ++i) DeadBlocks[i]->eraseFromParent(); + // Cleanup PHI nodes. + for (MachineFunction::iterator I = F.begin(), E = F.end(); I != E; ++I) { + MachineBasicBlock BB = I; + // Prune unneeded PHI entries. + SmallPtrSet preds(BB->pred_begin(), + BB->pred_end()); + MachineBasicBlock::iterator phi = BB->begin(); + while (phi != BB->end() && + phi->getOpcode() == TargetInstrInfo::PHI) { + if (phi->getNumOperands() == 3) { + unsigned Input = phi->getOperand(1).getReg(); + unsigned Output = phi->getOperand(0).getReg(); + + MachineInstr temp = phi; + ++phi; + temp->eraseFromParent(); + + if (Input != Output) + F.getRegInfo().replaceRegWith(Output, Input); + + continue; + } + + for (unsigned i = phi->getNumOperands() - 1; i >= 2; i-=2) + if (!preds.count(phi->getOperand(i).getMBB())) { + phi->RemoveOperand(i); + phi->RemoveOperand(i-1); + } + + ++phi; + } + } + F.RenumberBlocks(); return DeadBlocks.size(); From kremenek at apple.com Wed Aug 6 18:21:19 2008 From: kremenek at apple.com (Ted Kremenek) Date: Wed, 06 Aug 2008 23:21:19 -0000 Subject: [llvm-commits] [llvm] r54434 - /llvm/tags/checker/checker-73/ Message-ID: <200808062321.m76NLJPS027319@zion.cs.uiuc.edu> Author: kremenek Date: Wed Aug 6 18:21:19 2008 New Revision: 54434 URL: http://llvm.org/viewvc/llvm-project?rev=54434&view=rev Log: Tagging checker-73. Added: llvm/tags/checker/checker-73/ - copied from r54433, llvm/trunk/ From evan.cheng at apple.com Wed Aug 6 19:43:25 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Thu, 07 Aug 2008 00:43:25 -0000 Subject: [llvm-commits] [llvm] r54438 - in /llvm/trunk: include/llvm/CodeGen/SelectionDAGISel.h lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Message-ID: <200808070043.m770hQRF029614@zion.cs.uiuc.edu> Author: evancheng Date: Wed Aug 6 19:43:25 2008 New Revision: 54438 URL: http://llvm.org/viewvc/llvm-project?rev=54438&view=rev Log: Factor code that finalize PHI nodes, jump tables, etc. out of SelectBasicBlock. No functionality changes. Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Modified: llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h?rev=54438&r1=54437&r2=54438&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h (original) +++ llvm/trunk/include/llvm/CodeGen/SelectionDAGISel.h Wed Aug 6 19:43:25 2008 @@ -182,10 +182,15 @@ FunctionLoweringInfo &FuncInfo); void SelectBasicBlock(BasicBlock BB, MachineFunction &MF, FunctionLoweringInfo &FuncInfo, + std::vector > &PHINodesToUpdate, + NodeAllocatorType &NodeAllocator); + void FinishBasicBlock(BasicBlock BB, MachineFunction &MF, + FunctionLoweringInfo &FuncInfo, + std::vector > &PHINodesToUpdate, NodeAllocatorType &NodeAllocator); void BuildSelectionDAG(SelectionDAG &DAG, BasicBlock LLVMBB, - std::vector > &PHINodesToUpdate, + std::vector > &PHINodesToUpdate, FunctionLoweringInfo &FuncInfo); void CodeGenAndEmitDAG(SelectionDAG &DAG); void LowerArguments(BasicBlock BB, SelectionDAGLowering &SDL); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54438&r1=54437&r2=54438&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Wed Aug 6 19:43:25 2008 @@ -5441,29 +5441,38 @@ // each basic block. NodeAllocatorType NodeAllocator; - for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) - SelectBasicBlock(I, MF, FuncInfo, NodeAllocator); + std::vector > PHINodesToUpdate; + for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) { + BasicBlock LLVMBB = &I; + PHINodesToUpdate.clear(); + SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator); + FinishBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator); + } } void SelectionDAGISel::SelectBasicBlock(BasicBlock LLVMBB, MachineFunction &MF, FunctionLoweringInfo &FuncInfo, + std::vector > &PHINodesToUpdate, NodeAllocatorType &NodeAllocator) { - std::vector > PHINodesToUpdate; - { - SelectionDAG DAG(TLI, MF, FuncInfo, - getAnalysisToUpdate(), - NodeAllocator); - CurDAG = &DAG; - - // First step, lower LLVM code to some DAG. This DAG may use operations and - // types that are not supported by the target. - BuildSelectionDAG(DAG, LLVMBB, PHINodesToUpdate, FuncInfo); + SelectionDAG DAG(TLI, MF, FuncInfo, + getAnalysisToUpdate(), + NodeAllocator); + CurDAG = &DAG; + + // First step, lower LLVM code to some DAG. This DAG may use operations and + // types that are not supported by the target. + BuildSelectionDAG(DAG, LLVMBB, PHINodesToUpdate, FuncInfo); - // Second step, emit the lowered DAG as machine code. - CodeGenAndEmitDAG(DAG); - } + // Second step, emit the lowered DAG as machine code. + CodeGenAndEmitDAG(DAG); +} +void +SelectionDAGISel::FinishBasicBlock(BasicBlock LLVMBB, MachineFunction &MF, + FunctionLoweringInfo &FuncInfo, + std::vector > &PHINodesToUpdate, + NodeAllocatorType &NodeAllocator) { DOUT << "Total amount of phi nodes to update: " << PHINodesToUpdate.size() << "\n"; DEBUG(for (unsigned i = 0, e = PHINodesToUpdate.size(); i != e; ++i) From dalej at apple.com Wed Aug 6 20:30:15 2008 From: dalej at apple.com (Dale Johannesen) Date: Thu, 07 Aug 2008 01:30:15 -0000 Subject: [llvm-commits] [llvm] r54442 - in /llvm/trunk/lib/ExecutionEngine: ExecutionEngine.cpp JIT/JIT.cpp JIT/JITEmitter.cpp JIT/JITMemoryManager.cpp Message-ID: <200808070130.m771UFT7030940@zion.cs.uiuc.edu> Author: johannes Date: Wed Aug 6 20:30:15 2008 New Revision: 54442 URL: http://llvm.org/viewvc/llvm-project?rev=54442&view=rev Log: Rewrite JIT handling of GlobalVariables so they are allocated in the same buffer as the code, jump tables, etc. The default JIT memory manager does not handle buffer overflow well. I didn't introduce this and I'm not attempting to fix it here, but it is more likely to be hit now since we're putting more stuff in the buffer. This affects one test that I know of so far, MultiSource/Benchmarks/NPB-serial/is. Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp?rev=54442&r1=54441&r2=54442&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp Wed Aug 6 20:30:15 2008 @@ -819,6 +819,8 @@ // specified memory location... // void ExecutionEngine::InitializeMemory(const Constant Init, void Addr) { + DOUT << "Initializing " << Addr; + DEBUG(Init->dump()); if (isa(Init)) { return; } else if (const ConstantVector CP = dyn_cast(Init)) { Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp?rev=54442&r1=54441&r2=54442&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp Wed Aug 6 20:30:15 2008 @@ -415,30 +415,22 @@ cerr << "Could not resolve external global address: " << GV->getName() << "\n"; abort(); + addGlobalMapping(GV, Ptr); } } else { - // If the global hasn't been emitted to memory yet, allocate space. We will - // actually initialize the global after current function has finished - // compilation. + // If the global hasn't been emitted to memory yet, allocate space and + // emit it into memory. It goes in the same array as the generated + // code, jump tables, etc. const Type GlobalType = GV->getType()->getElementType(); size_t S = getTargetData()->getABITypeSize(GlobalType); size_t A = getTargetData()->getPreferredAlignment(GV); - if (A <= 8) { - Ptr = malloc(S); - } else { - // Allocate S+A bytes of memory, then use an aligned pointer within that - // space. - Ptr = malloc(S+A); - unsigned MisAligned = ((intptr_t)Ptr & (A-1)); - Ptr = (char)Ptr + (MisAligned ? (A-MisAligned) : 0); - } - jitstate->getPendingGlobals(locked).push_back(GV); + Ptr = MCE->allocateSpace(S, A); + addGlobalMapping(GV, Ptr); + EmitGlobalVariable(GV); } - addGlobalMapping(GV, Ptr); return Ptr; } - /// recompileAndRelinkFunction - This method is used to force a function /// which has already been compiled, to be compiled again, possibly /// after it has been modified. Then the entry to the old copy is overwritten Modified: llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp?rev=54442&r1=54441&r2=54442&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JITEmitter.cpp Wed Aug 6 20:30:15 2008 @@ -15,9 +15,9 @@ #define DEBUG_TYPE "jit" #include "JIT.h" #include "JITDwarfEmitter.h" -#include "llvm/Constant.h" +#include "llvm/Constants.h" #include "llvm/Module.h" -#include "llvm/Type.h" +#include "llvm/DerivedTypes.h" #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineConstantPool.h" @@ -25,6 +25,7 @@ #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/MachineRelocation.h" #include "llvm/ExecutionEngine/JITMemoryManager.h" +#include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetJITInfo.h" #include "llvm/Target/TargetMachine.h" @@ -36,6 +37,7 @@ #include "llvm/Target/TargetInstrInfo.h" #include "llvm/ADT/Statistic.h" #include +#include using namespace llvm; STATISTIC(NumBytes, "Number of bytes of machine code compiled"); @@ -467,6 +469,9 @@ /// MMI - Machine module info for exception informations MachineModuleInfo MMI; + // GVSet - a set to keep track of which globals have been seen + std::set GVSet; + public: JITEmitter(JIT &jit, JITMemoryManager JMM) : Resolver(jit) { MemMgr = JMM ? JMM : JITMemoryManager::CreateDefaultMemManager(); @@ -541,6 +546,10 @@ void getPointerToGlobal(GlobalValue GV, void Reference, bool NoNeedStub); void getPointerToGVLazyPtr(GlobalValue V, void Reference, bool NoNeedStub); + unsigned addSizeOfGlobal(const GlobalVariable GV, unsigned Size); + unsigned addSizeOfGlobalsInConstantVal(const Constant C, unsigned Size); + unsigned addSizeOfGlobalsInInitializer(const Constant Init, unsigned Size); + unsigned GetSizeOfGlobalsInBytes(MachineFunction &MF); }; } @@ -618,9 +627,154 @@ return Size + Alignment; } +/// addSizeOfGlobal - add the size of the global (plus any alignment padding) +/// into the running total Size. + +unsigned JITEmitter::addSizeOfGlobal(const GlobalVariable GV, unsigned Size) { + const Type ElTy = GV->getType()->getElementType(); + size_t GVSize = (size_t)TheJIT->getTargetData()->getABITypeSize(ElTy); + size_t GVAlign = + (size_t)TheJIT->getTargetData()->getPreferredAlignment(GV); + DOUT << "Adding in size " << GVSize << " alignment " << GVAlign; + DEBUG(GV->dump()); + // Assume code section ends with worst possible alignment, so first + // variable needs maximal padding. + if (Size==0) + Size = 1; + Size = ((Size+GVAlign-1)/GVAlign)GVAlign; + Size += GVSize; + return Size; +} + +/// addSizeOfGlobalsInConstantVal - find any globals that we haven't seen yet +/// but are referenced from the constant; put them in GVSet and add their +/// size into the running total Size. + +unsigned JITEmitter::addSizeOfGlobalsInConstantVal(const Constant C, + unsigned Size) { + // If its undefined, return the garbage. + if (isa(C)) + return Size; + + // If the value is a ConstantExpr + if (const ConstantExpr CE = dyn_cast(C)) { + Constant Op0 = CE->getOperand(0); + switch (CE->getOpcode()) { + case Instruction::GetElementPtr: + case Instruction::Trunc: + case Instruction::ZExt: + case Instruction::SExt: + case Instruction::FPTrunc: + case Instruction::FPExt: + case Instruction::UIToFP: + case Instruction::SIToFP: + case Instruction::FPToUI: + case Instruction::FPToSI: + case Instruction::PtrToInt: + case Instruction::IntToPtr: + case Instruction::BitCast: { + Size = addSizeOfGlobalsInConstantVal(Op0, Size); + break; + } + case Instruction::Add: + case Instruction::Sub: + case Instruction::Mul: + case Instruction::UDiv: + case Instruction::SDiv: + case Instruction::URem: + case Instruction::SRem: + case Instruction::And: + case Instruction::Or: + case Instruction::Xor: { + Size = addSizeOfGlobalsInConstantVal(Op0, Size); + Size = addSizeOfGlobalsInConstantVal(CE->getOperand(1), Size); + break; + } + default: { + cerr << "ConstantExpr not handled: " << CE << "\n"; + abort(); + } + } + } + + if (C->getType()->getTypeID() == Type::PointerTyID) + if (const GlobalVariable GV = dyn_cast(C)) + if (GVSet.insert(GV).second) + Size = addSizeOfGlobal(GV, Size); + + return Size; +} + +/// addSizeOfGLobalsInInitializer - handle any globals that we haven't seen yet +/// but are referenced from the given initializer. + +unsigned JITEmitter::addSizeOfGlobalsInInitializer(const Constant Init, + unsigned Size) { + if (!isa(Init) && + !isa(Init) && + !isa(Init) && + !isa(Init) && + !isa(Init) && + Init->getType()->isFirstClassType()) + Size = addSizeOfGlobalsInConstantVal(Init, Size); + return Size; +} + +/// GetSizeOfGlobalsInBytes - walk the code for the function, looking for +/// globals; then walk the initializers of those globals looking for more. +/// If their size has not been considered yet, add it into the running total +/// Size. + +unsigned JITEmitter::GetSizeOfGlobalsInBytes(MachineFunction &MF) { + unsigned Size = 0; + GVSet.clear(); + + for (MachineFunction::iterator MBB = MF.begin(), E = MF.end(); + MBB != E; ++MBB) { + for (MachineBasicBlock::const_iterator I = MBB->begin(), E = MBB->end(); + I != E; ++I) { + const TargetInstrDesc &Desc = I->getDesc(); + const MachineInstr &MI = I; + unsigned NumOps = Desc.getNumOperands(); + for (unsigned CurOp = 0; CurOp < NumOps; CurOp++) { + const MachineOperand &MO = MI.getOperand(CurOp); + if (MO.isGlobalAddress()) { + GlobalValue* V = MO.getGlobal(); + const GlobalVariable GV = dyn_cast(V); + if (!GV) + continue; + // If seen in previous function, it will have an entry here. + if (TheJIT->getPointerToGlobalIfAvailable(GV)) + continue; + // If seen earlier in this function, it will have an entry here. + // FIXME: it should be possible to combine these tables, by + // assuming the addresses of the new globals in this module + // start at 0 (or something) and adjusting them after codegen + // complete. Another possibility is to grab a marker bit in GV. + if (GVSet.insert(GV).second) + // A variable as yet unseen. Add in its size. + Size = addSizeOfGlobal(GV, Size); + } + } + } + } + DOUT << "About to look through initializers\n"; + // Look for more globals that are referenced only from initializers. + // GVSet.end is computed each time because the set can grow as we go. + for (std::set::iterator I = GVSet.begin(); + I != GVSet.end(); I++) { + const GlobalVariable GV = I; + if (GV->hasInitializer()) + Size = addSizeOfGlobalsInInitializer(GV->getInitializer(), Size); + } + + return Size; +} + void JITEmitter::startFunction(MachineFunction &F) { uintptr_t ActualSize = 0; if (MemMgr->NeedsExactSize()) { + DOUT << "ExactSize\n"; const TargetInstrInfo TII = F.getTarget().getInstrInfo(); MachineJumpTableInfo MJTI = F.getJumpTableInfo(); MachineConstantPool MCP = F.getConstantPool(); @@ -647,6 +801,13 @@ // Add the function size ActualSize += TII->GetFunctionSizeInBytes(F); + + DOUT << "ActualSize before globals " << ActualSize << "\n"; + // Add the size of the globals that will be allocated after this function. + // These are all the ones referenced from this function that were not + // previously allocated. + ActualSize += GetSizeOfGlobalsInBytes(F); + DOUT << "ActualSize after globals " << ActualSize << "\n"; } BufferBegin = CurBufferPtr = MemMgr->startFunctionBody(F.getFunction(), @@ -679,10 +840,6 @@ // other per-function data. unsigned char FnStart = (unsigned char )TheJIT->getPointerToGlobalIfAvailable(F.getFunction()); - unsigned char FnEnd = CurBufferPtr; - - MemMgr->endFunctionBody(F.getFunction(), BufferBegin, FnEnd); - NumBytes += FnEnd-FnStart; if (!Relocations.empty()) { NumRelos += Relocations.size(); @@ -734,6 +891,11 @@ Relocations.size(), MemMgr->getGOTBase()); } + unsigned char FnEnd = CurBufferPtr; + + MemMgr->endFunctionBody(F.getFunction(), BufferBegin, FnEnd); + NumBytes += FnEnd-FnStart; + // Update the GOT entry for F to point to the new code. if (MemMgr->isManagingGOT()) { unsigned idx = Resolver.getGOTIndexForAddr((void)BufferBegin); @@ -962,7 +1124,7 @@ /// freeMachineCodeForFunction - release machine code memory for given Function. /// void JIT::freeMachineCodeForFunction(Function F) { - + // Delete translation for this from the ExecutionEngine, so it will get // retranslated next time it is used. void OldPtr = updateGlobalMapping(F, 0); Modified: llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp?rev=54442&r1=54441&r2=54442&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JITMemoryManager.cpp Wed Aug 6 20:30:15 2008 @@ -290,7 +290,7 @@ assert(FunctionEnd > FunctionStart); assert(FunctionStart == (unsigned char )(CurBlock+1) && "Mismatched function start/end!"); - + uintptr_t BlockSize = FunctionEnd - (unsigned char )CurBlock; FunctionBlocks[F] = CurBlock; From gohman at apple.com Wed Aug 6 21:23:07 2008 From: gohman at apple.com (Dan Gohman) Date: Thu, 07 Aug 2008 02:23:07 -0000 Subject: [llvm-commits] [llvm] r54443 - /llvm/trunk/test/CodeGen/X86/zext-inreg-1.ll Message-ID: <200808070223.m772N7Zj032624@zion.cs.uiuc.edu> Author: djg Date: Wed Aug 6 21:23:06 2008 New Revision: 54443 URL: http://llvm.org/viewvc/llvm-project?rev=54443&view=rev Log: Add an extra example that shouldn't get an and instruction. Modified: llvm/trunk/test/CodeGen/X86/zext-inreg-1.ll Modified: llvm/trunk/test/CodeGen/X86/zext-inreg-1.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/zext-inreg-1.ll?rev=54443&r1=54442&r2=54443&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/X86/zext-inreg-1.ll (original) +++ llvm/trunk/test/CodeGen/X86/zext-inreg-1.ll Wed Aug 6 21:23:06 2008 @@ -6,7 +6,12 @@ ; These should use movzbl instead of 'and 255'. ; This related to not having ZERO_EXTEND_REG node. -define i64 @h(i64 %d) nounwind { +define i64 @l(i64 %d) nounwind { + %e = add i64 %d, 1 + %retval = and i64 %e, 1099511627775 + ret i64 %retval +} +define i64 @m(i64 %d) nounwind { %e = add i64 %d, 1 %retval = and i64 %e, 281474976710655 ret i64 %retval From gohman at apple.com Wed Aug 6 21:54:51 2008 From: gohman at apple.com (Dan Gohman) Date: Thu, 07 Aug 2008 02:54:51 -0000 Subject: [llvm-commits] [llvm] r54444 - in /llvm/trunk: lib/CodeGen/LowerSubregs.cpp lib/Target/X86/X86Instr64bit.td lib/Target/X86/X86InstrInfo.cpp test/CodeGen/X86/subreg-to-reg-0.ll test/CodeGen/X86/subreg-to-reg-1.ll Message-ID: <200808070254.m772spk3000960@zion.cs.uiuc.edu> Author: djg Date: Wed Aug 6 21:54:50 2008 New Revision: 54444 URL: http://llvm.org/viewvc/llvm-project?rev=54444&view=rev Log: Re-enable elimination of unnecessary SUBREG_TO_REG instructions in LowerSubregs, and fix an x86-64 isel bug that this exposed. SUBREG_TO_REG for x86-64 implicit zero extension is only safe for isel to generate when the source is known to always have zeros in the high 32 bits. The EXTRACT_SUBREG instruction does not clear the high 32 bits. Added: llvm/trunk/test/CodeGen/X86/subreg-to-reg-0.ll llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp llvm/trunk/lib/Target/X86/X86Instr64bit.td llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Modified: llvm/trunk/lib/CodeGen/LowerSubregs.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/LowerSubregs.cpp?rev=54444&r1=54443&r2=54444&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/LowerSubregs.cpp (original) +++ llvm/trunk/lib/CodeGen/LowerSubregs.cpp Wed Aug 6 21:54:50 2008 @@ -108,15 +108,20 @@ DOUT << "subreg: CONVERTING: " << MI; - // Insert sub-register copy - const TargetRegisterClass TRC0= TRI.getPhysicalRegisterRegClass(DstSubReg); - const TargetRegisterClass TRC1= TRI.getPhysicalRegisterRegClass(InsReg); - TII.copyRegToReg(MBB, MI, DstSubReg, InsReg, TRC0, TRC1); + if (DstSubReg == InsReg) { + // No need to insert an identify copy instruction. + DOUT << "subreg: eliminated!"; + } else { + // Insert sub-register copy + const TargetRegisterClass TRC0= TRI.getPhysicalRegisterRegClass(DstSubReg); + const TargetRegisterClass TRC1= TRI.getPhysicalRegisterRegClass(InsReg); + TII.copyRegToReg(MBB, MI, DstSubReg, InsReg, TRC0, TRC1); #ifndef NDEBUG MachineBasicBlock::iterator dMI = MI; DOUT << "subreg: " << (--dMI); #endif + } DOUT << "\n"; MBB->erase(MI); Modified: llvm/trunk/lib/Target/X86/X86Instr64bit.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86Instr64bit.td?rev=54444&r1=54443&r2=54444&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86Instr64bit.td (original) +++ llvm/trunk/lib/Target/X86/X86Instr64bit.td Wed Aug 6 21:54:50 2008 @@ -258,6 +258,18 @@ "movz{wl\|x}\t{$src, ${dst:subreg32}\|${dst:subreg32}, $src}", [(set GR64:$dst, (zextloadi64i16 addr:$src))]>, TB; +// There's no movzlq instruction, but movl can be used for this purpose, using +// implicit zero-extension. We need this because the seeming alternative for +// implementing zext from 32 to 64, an EXTRACT_SUBREG/SUBREG_TO_REG pair, isn't +// safe because both instructions could be optimized away in the +// register-to-register case, leaving nothing behind to do the zero extension. +def MOVZX64rr32 : I<0x89, MRMDestReg, (outs GR64:$dst), (ins GR32:$src), + "mov{l}\t{$src, ${dst:subreg32}\|${dst:subreg32}, $src}", + [(set GR64:$dst, (zext GR32:$src))]>; +def MOVZX64rm32 : I<0x8B, MRMSrcMem, (outs GR64:$dst), (ins i32mem:$src), + "mov{l}\t{$src, ${dst:subreg32}\|${dst:subreg32}, $src}", + [(set GR64:$dst, (zextloadi64i32 addr:$src))]>; + let neverHasSideEffects = 1 in { let Defs = [RAX], Uses = [EAX] in def CDQE : RI<0x98, RawFrm, (outs), (ins), @@ -1213,9 +1225,6 @@ // zextload bool -> zextload byte def : Pat<(zextloadi64i1 addr:$src), (MOVZX64rm8 addr:$src)>; -def : Pat<(zextloadi64i32 addr:$src), - (SUBREG_TO_REG (i64 0), (MOV32rm addr:$src), x86_subreg_32bit)>; - // extload def : Pat<(extloadi64i1 addr:$src), (MOVZX64rm8 addr:$src)>; def : Pat<(extloadi64i8 addr:$src), (MOVZX64rm8 addr:$src)>; @@ -1240,11 +1249,9 @@ // Some peepholes //===----------------------------------------------------------------------===// -// r & (2^32-1) ==> mov32 + implicit zext -def : Pat<(and GR64:$src, i64immFFFFFFFF), - (SUBREG_TO_REG (i64 0), - (i32 (EXTRACT_SUBREG GR64:$src, x86_subreg_32bit)), - x86_subreg_32bit)>; +// r & (2^32-1) ==> movz +def : Pat<(and GR64:$src, i64immFFFFFFFF), + (MOVZX64rr32 (i32 (EXTRACT_SUBREG GR64:$src, x86_subreg_32bit)))>; // r & (2^16-1) ==> movz def : Pat<(and GR64:$src, 0xffff), (MOVZX64rr16 (i16 (EXTRACT_SUBREG GR64:$src, x86_subreg_16bit)))>; Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=54444&r1=54443&r2=54444&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Wed Aug 6 21:54:50 2008 @@ -396,6 +396,7 @@ { X86::MOVZX32rr16, X86::MOVZX32rm16 }, { X86::MOVZX32rr8, X86::MOVZX32rm8 }, { X86::MOVZX64rr16, X86::MOVZX64rm16 }, + { X86::MOVZX64rr32, X86::MOVZX64rm32 }, { X86::MOVZX64rr8, X86::MOVZX64rm8 }, { X86::PSHUFDri, X86::PSHUFDmi }, { X86::PSHUFHWri, X86::PSHUFHWmi }, Added: llvm/trunk/test/CodeGen/X86/subreg-to-reg-0.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/subreg-to-reg-0.ll?rev=54444&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/subreg-to-reg-0.ll (added) +++ llvm/trunk/test/CodeGen/X86/subreg-to-reg-0.ll Wed Aug 6 21:54:50 2008 @@ -0,0 +1,11 @@ +; RUN: llvm-as < %s \| llc -march=x86-64 \| grep mov \| count 1 + +; Do eliminate the zero-extension instruction and rely on +; x86-64's implicit zero-extension! + +define i64 @foo(i32 %p) nounwind { + %t = load i32* %p + %n = add i32 %t, 1 + %z = zext i32 %n to i64 + ret i64 %z +} Added: llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll?rev=54444&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll (added) +++ llvm/trunk/test/CodeGen/X86/subreg-to-reg-1.ll Wed Aug 6 21:54:50 2008 @@ -0,0 +1,10 @@ +; RUN: llvm-as < %s \| llc -march=x86-64 \| grep {movl %e.\, %e.\} \| count 1 + +; Don't eliminate or coalesce away the explicit zero-extension! + +define i64 @foo(i64 %a) { + %b = add i64 %a, 4294967295 + %c = and i64 %b, 4294967295 + %d = add i64 %c, 1 + ret i64 %d +} From sabre at nondot.org Thu Aug 7 02:34:50 2008 From: sabre at nondot.org (Chris Lattner) Date: Thu, 07 Aug 2008 07:34:50 -0000 Subject: [llvm-commits] [llvm] r54446 - /llvm/trunk/lib/VMCore/PassManager.cpp Message-ID: <200808070734.m777Ypq1009820@zion.cs.uiuc.edu> Author: lattner Date: Thu Aug 7 02:34:50 2008 New Revision: 54446 URL: http://llvm.org/viewvc/llvm-project?rev=54446&view=rev Log: Don't verify passes when assertions are disabled. Modified: llvm/trunk/lib/VMCore/PassManager.cpp Modified: llvm/trunk/lib/VMCore/PassManager.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/PassManager.cpp?rev=54446&r1=54445&r2=54446&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/PassManager.cpp (original) +++ llvm/trunk/lib/VMCore/PassManager.cpp Thu Aug 7 02:34:50 2008 @@ -598,8 +598,12 @@ return true; } -/// verifyPreservedAnalysis -- Verify analysis presreved by pass P. +/// verifyPreservedAnalysis -- Verify analysis preserved by pass P. void PMDataManager::verifyPreservedAnalysis(Pass P) { + // Don't do this unless assertions are enabled. +#ifdef NDEBUG + return; +#endif AnalysisUsage AnUsage; P->getAnalysisUsage(AnUsage); const std::vector &PreservedSet = AnUsage.getPreservedSet(); @@ -608,8 +612,7 @@ for (std::vector::const_iterator I = PreservedSet.begin(), E = PreservedSet.end(); I != E; ++I) { AnalysisID AID = I; - Pass AP = findAnalysisPass(AID, true); - if (AP) + if (Pass AP = findAnalysisPass(AID, true)) AP->verifyAnalysis(); } } @@ -1318,7 +1321,7 @@ dumpPassInfo(MP, MODIFICATION_MSG, ON_MODULE_MSG, M.getModuleIdentifier().c_str()); dumpAnalysisSetInfo("Preserved", MP, AnUsage.getPreservedSet()); - + verifyPreservedAnalysis(MP); removeNotPreservedAnalysis(MP); recordAvailableAnalysis(MP); From baldrick at free.fr Thu Aug 7 04:30:58 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 7 Aug 2008 11:30:58 +0200 Subject: [llvm-commits] [llvm-gcc-4.2] r54327 - in /llvm-gcc-4.2/trunk/libcpp: ChangeLog.apple charset.c In-Reply-To: <16e5fdf90808061352i7f5c6a40v5ee120a1da706d84@mail.gmail.com> References: <200808042005.m74K5VhN025172@zion.cs.uiuc.edu> <200808062243.15576.baldrick@free.fr> <16e5fdf90808061352i7f5c6a40v5ee120a1da706d84@mail.gmail.com> Message-ID: <200808071130.59015.baldrick@free.fr> > I'm not sure exactly what to do in this situation, or what the code > expects down the line. If the code has been there for awhile, I would > err on the side of caution and just keep it like it is. What do you > think? The code that enlarges the buffer and sets the size has been there for a million years, so let's leave it alone. Ciao, Duncan. From asl at math.spbu.ru Thu Aug 7 04:50:35 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:50:35 -0000 Subject: [llvm-commits] [llvm] r54448 - in /llvm/trunk: include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h lib/Target/ELFTargetAsmInfo.cpp lib/Target/TargetAsmInfo.cpp Message-ID: <200808070950.m779oZcJ027409@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:50:34 2008 New Revision: 54448 URL: http://llvm.org/viewvc/llvm-project?rev=54448&view=rev Log: Select section for constant pool entries Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h llvm/trunk/include/llvm/Target/TargetAsmInfo.h llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp llvm/trunk/lib/Target/TargetAsmInfo.cpp Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h?rev=54448&r1=54447&r2=54448&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h Thu Aug 7 04:50:34 2008 @@ -21,6 +21,7 @@ namespace llvm { class GlobalValue; class GlobalVariable; + class Type; struct ELFTargetAsmInfo: public virtual TargetAsmInfo { explicit ELFTargetAsmInfo(const TargetMachine &TM); @@ -28,7 +29,10 @@ virtual const Section* SelectSectionForGlobal(const GlobalValue GV) const; virtual std::string PrintSectionFlags(unsigned flags) const; const Section MergeableConstSection(const GlobalVariable GV) const; + inline const Section MergeableConstSection(const Type Ty) const; const Section MergeableStringSection(const GlobalVariable GV) const; + virtual const Section + SelectSectionForMachineConst(const Type Ty) const; protected: const TargetMachine ETM; }; Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=54448&r1=54447&r2=54448&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Thu Aug 7 04:50:34 2008 @@ -76,6 +76,7 @@ class TargetMachine; class CallInst; class GlobalValue; + class Type; class Section { friend class TargetAsmInfo; @@ -542,6 +543,8 @@ virtual const Section* SelectSectionForGlobal(const GlobalValue GV) const; + virtual const Section SelectSectionForMachineConst(const Type Ty) const; + // Accessors. // const char getTextSection() const { Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=54448&r1=54447&r2=54448&view=diff ============================================================================== --- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Thu Aug 7 04:50:34 2008 @@ -17,6 +17,7 @@ #include "llvm/Function.h" #include "llvm/GlobalVariable.h" #include "llvm/ADT/StringExtras.h" +#include "llvm/CodeGen/MachineConstantPool.h" #include "llvm/Target/ELFTargetAsmInfo.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetData.h" @@ -90,15 +91,27 @@ } const Section* +ELFTargetAsmInfo::SelectSectionForMachineConst(const Type Ty) const { + // FIXME: Support data.rel stuff someday + return MergeableConstSection(Ty); +} + +const Section ELFTargetAsmInfo::MergeableConstSection(const GlobalVariable GV) const { - const TargetData TD = ETM->getTargetData(); Constant C = cast(GV)->getInitializer(); - const Type Type = C->getType(); + const Type Ty = C->getType(); + + return MergeableConstSection(Ty); +} + +inline const Section +ELFTargetAsmInfo::MergeableConstSection(const Type Ty) const { + const TargetData TD = ETM->getTargetData(); // FIXME: string here is temporary, until stuff will fully land in. // We cannot use {Four,Eight,Sixteen}ByteConstantSection here, since it's // currently directly used by asmprinter. - unsigned Size = TD->getABITypeSize(Type); + unsigned Size = TD->getABITypeSize(Ty); if (Size == 4 \|\| Size == 8 \|\| Size == 16) { std::string Name = ".rodata.cst" + utostr(Size); Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=54448&r1=54447&r2=54448&view=diff ============================================================================== --- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Thu Aug 7 04:50:34 2008 @@ -321,6 +321,13 @@ return getDataSection_(); } +// Lame default implementation. Calculate the section name for machine const. +const Section* +TargetAsmInfo::SelectSectionForMachineConst(const Type Ty) const { + // FIXME: Support data.rel stuff someday + return getDataSection_(); +} + std::string TargetAsmInfo::UniqueSectionForGlobal(const GlobalValue GV, SectionKind::Kind Kind) const { From asl at math.spbu.ru Thu Aug 7 04:51:03 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:51:03 -0000 Subject: [llvm-commits] [llvm] r54449 - in /llvm/trunk: include/llvm/Target/DarwinTargetAsmInfo.h lib/Target/DarwinTargetAsmInfo.cpp lib/Target/ELFTargetAsmInfo.cpp Message-ID: <200808070951.m779p3BI027431@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:51:02 2008 New Revision: 54449 URL: http://llvm.org/viewvc/llvm-project?rev=54449&view=rev Log: Add hook for constant pool section selection for darwin. Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=54449&r1=54448&r2=54449&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Thu Aug 7 04:51:02 2008 @@ -21,6 +21,7 @@ namespace llvm { class GlobalValue; class GlobalVariable; + class Type; struct DarwinTargetAsmInfo: public virtual TargetAsmInfo { const Section* TextCoalSection; @@ -33,7 +34,9 @@ virtual std::string UniqueSectionForGlobal(const GlobalValue* GV, SectionKind::Kind kind) const; const Section* MergeableConstSection(const GlobalVariable GV) const; + const Section MergeableConstSection(const Type Ty) const; const Section MergeableStringSection(const GlobalVariable GV) const; + const Section SelectSectionForMachineConst(const Type Ty) const; protected: const TargetMachine DTM; }; Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=54449&r1=54448&r2=54449&view=diff ============================================================================== --- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Thu Aug 7 04:51:02 2008 @@ -107,10 +107,16 @@ const Section* DarwinTargetAsmInfo::MergeableConstSection(const GlobalVariable GV) const { - const TargetData TD = DTM->getTargetData(); Constant C = cast(GV)->getInitializer(); - unsigned Size = TD->getABITypeSize(C->getType()); + return MergeableConstSection(C->getType()); +} + +inline const Section +DarwinTargetAsmInfo::MergeableConstSection(const Type Ty) const { + const TargetData TD = DTM->getTargetData(); + + unsigned Size = TD->getABITypeSize(Ty); if (Size == 4) return FourByteConstantSection_; else if (Size == 8) @@ -121,6 +127,18 @@ return getReadOnlySection_(); } +const Section* +DarwinTargetAsmInfo::SelectSectionForMachineConst(const Type Ty) const { + const Section S = MergeableConstSection(Ty); + + // Handle weird special case, when compiling PIC stuff. + if (S == getReadOnlySection_() && + DTM->getRelocationModel() != Reloc::Static) + return ConstDataSection; + + return S; +} + std::string DarwinTargetAsmInfo::UniqueSectionForGlobal(const GlobalValue* GV, SectionKind::Kind kind) const { Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=54449&r1=54448&r2=54449&view=diff ============================================================================== --- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Thu Aug 7 04:51:02 2008 @@ -99,9 +99,7 @@ const Section* ELFTargetAsmInfo::MergeableConstSection(const GlobalVariable GV) const { Constant C = cast(GV)->getInitializer(); - const Type Ty = C->getType(); - - return MergeableConstSection(Ty); + return MergeableConstSection(C->getType()); } inline const Section From asl at math.spbu.ru Thu Aug 7 04:51:25 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:51:25 -0000 Subject: [llvm-commits] [llvm] r54450 - in /llvm/trunk/lib/Target/Sparc: SparcAsmPrinter.cpp SparcTargetAsmInfo.cpp SparcTargetAsmInfo.h SparcTargetMachine.cpp Message-ID: <200808070951.m779pQks027457@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:51:25 2008 New Revision: 54450 URL: http://llvm.org/viewvc/llvm-project?rev=54450&view=rev Log: Switch Sparc to new section handling stuff. Refactor printing of module-level GVs significantly. Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.h llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp?rev=54450&r1=54449&r2=54450&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Thu Aug 7 04:51:25 2008 @@ -54,6 +54,7 @@ return "Sparc Assembly Printer"; } + void printModuleLevelGV(const GlobalVariable* GVar); void printOperand(const MachineInstr MI, int opNum); void printMemOperand(const MachineInstr MI, int opNum, const char Modifier = 0); @@ -61,6 +62,7 @@ bool printInstruction(const MachineInstr MI); // autogenerated. bool runOnMachineFunction(MachineFunction &F); + std::string getSectionForFunction(const Function &F) const; bool doInitialization(Module &M); bool doFinalization(Module &M); }; @@ -78,6 +80,11 @@ return new SparcAsmPrinter(o, tm, tm.getTargetAsmInfo()); } +// Substitute old hook with new one temporary +std::string SparcAsmPrinter::getSectionForFunction(const Function &F) const { + return TAI->SectionForGlobal(&F); +} + /// runOnMachineFunction - This uses the printInstruction() /// method to print assembly for each instruction. /// @@ -177,21 +184,21 @@ void SparcAsmPrinter::printMemOperand(const MachineInstr MI, int opNum, const char Modifier) { printOperand(MI, opNum); - + // If this is an ADD operand, emit it like normal operands. if (Modifier && !strcmp(Modifier, "arith")) { O << ", "; printOperand(MI, opNum+1); return; } - + if (MI->getOperand(opNum+1).isRegister() && MI->getOperand(opNum+1).getReg() == SP::G0) return; // don't print "+%g0" if (MI->getOperand(opNum+1).isImmediate() && MI->getOperand(opNum+1).getImm() == 0) return; // don't print "+0" - + O << "+"; if (MI->getOperand(opNum+1).isGlobalAddress() \|\| MI->getOperand(opNum+1).isConstantPoolIndex()) { @@ -216,77 +223,90 @@ } bool SparcAsmPrinter::doFinalization(Module &M) { - const TargetData TD = TM.getTargetData(); - // Print out module-level global variables here. for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I) - if (I->hasInitializer()) { // External global require no code - // Check to see if this is a special global used by LLVM, if so, emit it. - if (EmitSpecialLLVMGlobal(I)) - continue; - - O << "\n\n"; - std::string name = Mang->getValueName(I); - Constant C = I->getInitializer(); - unsigned Size = TD->getABITypeSize(C->getType()); - unsigned Align = TD->getPreferredAlignment(I); - - if (C->isNullValue() && (I->hasCommonLinkage() \|\| - I->hasLinkOnceLinkage() \|\| I->hasInternalLinkage() \|\| - I->hasWeakLinkage() /* FIXME: Verify correct /)) { - SwitchToDataSection(".data", I); - if (I->hasInternalLinkage()) - O << "\t.local " << name << "\n"; - - O << "\t.comm " << name << "," << TD->getABITypeSize(C->getType()) - << "," << Align; - O << "\n"; - } else { - switch (I->getLinkage()) { - case GlobalValue::CommonLinkage: - case GlobalValue::LinkOnceLinkage: - case GlobalValue::WeakLinkage: // FIXME: Verify correct for weak. - // Nonnull linkonce -> weak - O << "\t.weak " << name << "\n"; - SwitchToDataSection("", I); - O << "\t.section\t\".llvm.linkonce.d." << name - << "\",\"aw\", at progbits\n"; - break; - - case GlobalValue::AppendingLinkage: - // FIXME: appending linkage variables should go into a section of - // their name or something. For now, just emit them as external. - case GlobalValue::ExternalLinkage: - // If external or appending, declare as a global symbol - O << "\t.globl " << name << "\n"; - // FALL THROUGH - case GlobalValue::InternalLinkage: - if (C->isNullValue()) - SwitchToDataSection(".bss", I); - else - SwitchToDataSection(".data", I); - break; - case GlobalValue::GhostLinkage: - cerr << "Should not have any unmaterialized functions!\n"; - abort(); - case GlobalValue::DLLImportLinkage: - cerr << "DLLImport linkage is not supported by this target!\n"; - abort(); - case GlobalValue::DLLExportLinkage: - cerr << "DLLExport linkage is not supported by this target!\n"; - abort(); - default: - assert(0 && "Unknown linkage type!"); - } - - O << "\t.align " << Align << "\n"; - O << "\t.type " << name << ",#object\n"; - O << "\t.size " << name << "," << Size << "\n"; - O << name << ":\n"; - EmitGlobalConstant(C); - } - } + printModuleLevelGV(I); + + O << '\n'; return AsmPrinter::doFinalization(M); } + +void SparcAsmPrinter::printModuleLevelGV(const GlobalVariable GVar) { + const TargetData TD = TM.getTargetData(); + + if (!GVar->hasInitializer()) + return; // External global require no code + + // Check to see if this is a special global used by LLVM, if so, emit it. + if (EmitSpecialLLVMGlobal(GVar)) + return; + + O << "\n\n"; + std::string SectionName = TAI->SectionForGlobal(GVar); + std::string name = Mang->getValueName(GVar); + Constant C = GVar->getInitializer(); + unsigned Size = TD->getABITypeSize(C->getType()); + unsigned Align = TD->getPreferredAlignment(GVar); + + // FIXME: ELF supports visibility + SwitchToDataSection(SectionName.c_str()); + + if (C->isNullValue() && !GVar->hasSection()) { + if (!GVar->isThreadLocal() && + (GVar->hasInternalLinkage() \|\| GVar->isWeakForLinker())) { + if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. + + if (GVar->hasInternalLinkage()) + O << "\t.local " << name << "\n"; + + O << TAI->getCOMMDirective() << name << ',' << Size; + if (TAI->getCOMMDirectiveTakesAlignment()) + O << ',' << (1 << Align); + + O << '\n'; + return; + } + } + + switch (GVar->getLinkage()) { + case GlobalValue::CommonLinkage: + case GlobalValue::LinkOnceLinkage: + case GlobalValue::WeakLinkage: // FIXME: Verify correct for weak. + // Nonnull linkonce -> weak + O << "\t.weak " << name << "\n"; + break; + case GlobalValue::AppendingLinkage: + // FIXME: appending linkage variables should go into a section of + // their name or something. For now, just emit them as external. + case GlobalValue::ExternalLinkage: + // If external or appending, declare as a global symbol + O << TAI->getGlobalDirective() << name << "\n"; + // FALL THROUGH + case GlobalValue::InternalLinkage: + break; + case GlobalValue::GhostLinkage: + cerr << "Should not have any unmaterialized functions!\n"; + abort(); + case GlobalValue::DLLImportLinkage: + cerr << "DLLImport linkage is not supported by this target!\n"; + abort(); + case GlobalValue::DLLExportLinkage: + cerr << "DLLExport linkage is not supported by this target!\n"; + abort(); + default: + assert(0 && "Unknown linkage type!"); + } + + if (Align) + O << "\t.align " << Align << "\n"; + + if (TAI->hasDotTypeDotSizeDirective()) { + O << "\t.type " << name << ",#object\n"; + O << "\t.size " << name << "," << Size << "\n"; + } + + O << name << ":\n"; + EmitGlobalConstant(C); +} Modified: llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp?rev=54450&r1=54449&r2=54450&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Thu Aug 7 04:51:25 2008 @@ -15,11 +15,31 @@ using namespace llvm; -SparcTargetAsmInfo::SparcTargetAsmInfo(const SparcTargetMachine &TM) { +SparcELFTargetAsmInfo::SparcELFTargetAsmInfo(const TargetMachine &TM): + ELFTargetAsmInfo(TM) { Data16bitsDirective = "\t.half\t"; Data32bitsDirective = "\t.word\t"; Data64bitsDirective = 0; // .xword is only supported by V9. ZeroDirective = "\t.skip\t"; CommentString = "!"; ConstantPoolSection = "\t.section \".rodata\",#alloc\n"; + COMMDirectiveTakesAlignment = true; +} + +std::string SparcELFTargetAsmInfo::PrintSectionFlags(unsigned flags) const { + std::string Flags = ","; + + if (flags & SectionFlags::Mergeable) + return ELFTargetAsmInfo::PrintSectionFlags(flags); + + if (!(flags & SectionFlags::Debug)) + Flags += "#alloc"; + if (flags & SectionFlags::Code) + Flags += "#execinstr"; + if (flags & SectionFlags::Writeable) + Flags += "#write"; + if (flags & SectionFlags::TLS) + Flags += "#tls"; + + return Flags; } Modified: llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.h?rev=54450&r1=54449&r2=54450&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.h (original) +++ llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.h Thu Aug 7 04:51:25 2008 @@ -15,16 +15,18 @@ #define SPARCTARGETASMINFO_H #include "llvm/Target/TargetAsmInfo.h" +#include "llvm/Target/ELFTargetAsmInfo.h" namespace llvm { // Forward declaration. - class SparcTargetMachine; + class TargetMachine; - struct SparcTargetAsmInfo : public TargetAsmInfo { - explicit SparcTargetAsmInfo(const SparcTargetMachine &TM); - }; + struct SparcELFTargetAsmInfo : public ELFTargetAsmInfo { + explicit SparcELFTargetAsmInfo(const TargetMachine &TM); + std::string PrintSectionFlags(unsigned flags) const; + }; } // namespace llvm Modified: llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp?rev=54450&r1=54449&r2=54450&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcTargetMachine.cpp Thu Aug 7 04:51:25 2008 @@ -22,7 +22,8 @@ static RegisterTarget X("sparc", " SPARC"); const TargetAsmInfo SparcTargetMachine::createTargetAsmInfo() const { - return new SparcTargetAsmInfo(this); + // FIXME: Handle Solaris subtarget someday :) + return new SparcELFTargetAsmInfo(this); } /// SparcTargetMachine ctor - Create an ILP32 architecture model From asl at math.spbu.ru Thu Aug 7 04:51:55 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:51:55 -0000 Subject: [llvm-commits] [llvm] r54451 - in /llvm/trunk: include/llvm/Target/TargetAsmInfo.h lib/Target/Mips/MipsTargetAsmInfo.cpp lib/Target/TargetAsmInfo.cpp Message-ID: <200808070951.m779pt9x027481@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:51:54 2008 New Revision: 54451 URL: http://llvm.org/viewvc/llvm-project?rev=54451&view=rev Log: Provide convenient helpers Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp llvm/trunk/lib/Target/TargetAsmInfo.cpp Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=54451&r1=54450&r2=54451&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Thu Aug 7 04:51:54 2008 @@ -45,6 +45,18 @@ ThreadData, ///< Initialized TLS data objects ThreadBSS ///< Uninitialized TLS data objects }; + + static inline bool isReadOnly(Kind K) { + return (K == SectionKind::ROData \|\| + K == SectionKind::RODataMergeConst \|\| + K == SectionKind::RODataMergeStr \|\| + K == SectionKind::SmallROData); + } + + static inline bool isBSS(Kind K) { + return (K == SectionKind::BSS \|\| + K == SectionKind::SmallBSS); + } } namespace SectionFlags { Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp?rev=54451&r1=54450&r2=54451&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp Thu Aug 7 04:51:54 2008 @@ -61,7 +61,7 @@ if (Subtarget->hasABICall()) return K; - if (K != SectionKind::Data && K != SectionKind::BSS && + if (K != SectionKind::Data && K != SectionKind::BSS && K != SectionKind::RODataMergeConst) return K; @@ -69,7 +69,7 @@ const TargetData TD = ETM->getTargetData(); unsigned Size = TD->getABITypeSize(GV->getType()->getElementType()); unsigned Threshold = Subtarget->getSSectionThreshold(); - + if (Size > 0 && Size <= Threshold) { if (K == SectionKind::BSS) return SectionKind::SmallBSS; Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=54451&r1=54450&r2=54451&view=diff ============================================================================== --- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Thu Aug 7 04:51:54 2008 @@ -306,15 +306,9 @@ } else { if (Kind == SectionKind::Text) return getTextSection_(); - else if ((Kind == SectionKind::BSS \|\| - Kind == SectionKind::SmallBSS) && - getBSSSection_()) + else if (isBSS(Kind) && getBSSSection_()) return getBSSSection_(); - else if (getReadOnlySection_() && - (Kind == SectionKind::ROData \|\| - Kind == SectionKind::RODataMergeConst \|\| - Kind == SectionKind::RODataMergeStr \|\| - Kind == SectionKind::SmallROData)) + else if (getReadOnlySection_() && SectionKind::isReadOnly(Kind)) return getReadOnlySection_(); } From asl at math.spbu.ru Thu Aug 7 04:52:14 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:52:14 -0000 Subject: [llvm-commits] [llvm] r54452 - /llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Message-ID: <200808070952.m779qEOt027502@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:52:13 2008 New Revision: 54452 URL: http://llvm.org/viewvc/llvm-project?rev=54452&view=rev Log: Cleanup Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp?rev=54452&r1=54451&r2=54452&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Thu Aug 7 04:52:13 2008 @@ -84,12 +84,12 @@ // XXX : nasty hack to avoid GPREL22 "relocation truncated to fit" linker // errors - instead of add rX = @gprel(CPI), r1;; we now // emit movl rX = @gprel(CPIgetOperand(OpNo).isImmediate()) { O << (int64_t)MI->getOperand(OpNo).getImm(); } else { // this is a constant pool reference: FIXME: assert this @@ -120,9 +120,9 @@ #include "IA64GenAsmWriter.inc" +// Substitute old hook with new one temporary std::string IA64AsmPrinter::getSectionForFunction(const Function &F) const { - // This means "Allocated instruXions in mem, initialized". - return "\n\t.section .text, \"ax\", \"progbits\"\n"; + return TAI->SectionForGlobal(&F); } /// runOnMachineFunction - This uses the printMachineInstruction() @@ -210,7 +210,7 @@ if (Needfptr) O << "@fptr("; O << Mang->getValueName(MO.getGlobal()); - + if (Needfptr && !isBRCALLinsn) O << "#))"; // close both fptr( and ltoff( else { @@ -219,7 +219,7 @@ if (!isBRCALLinsn) O << "#)"; // close only ltoff( } - + int Offset = MO.getOffset(); if (Offset > 0) O << " + " << Offset; @@ -258,7 +258,7 @@ bool IA64AsmPrinter::doFinalization(Module &M) { const TargetData TD = TM.getTargetData(); - + // Print out module-level global variables here. for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I) @@ -266,7 +266,7 @@ // Check to see if this is a special global used by LLVM, if so, emit it. if (EmitSpecialLLVMGlobal(I)) continue; - + O << "\n\n"; std::string name = Mang->getValueName(I); Constant C = I->getInitializer(); @@ -318,9 +318,9 @@ cerr << "DLLExport linkage is not supported by this target!\n"; abort(); default: - assert(0 && "Unknown linkage type!"); + assert(0 && "Unknown linkage type!"); } - + EmitAlignment(Align); O << "\t.type " << name << ", at object\n"; O << "\t.size " << name << "," << Size << "\n"; @@ -328,15 +328,15 @@ EmitGlobalConstant(C); } } - - // we print out ".global X \n .type X, @function" for each external function - O << "\n\n// br.call targets referenced (and not defined) above: \n"; + + // we print out ".global X \n .type X, @function" for each external function + O << "\n\n// br.call targets referenced (and not defined) above: \n"; for (std::set::iterator i = ExternalFunctionNames.begin(), e = ExternalFunctionNames.end(); i!=e; ++i) { O << "\t.global " << i << "\n\t.type " << i << ", @function\n"; } O << "\n\n"; - + // we print out ".global X \n .type X, @object" for each external object O << "\n\n// (external) symbols referenced (and not defined) above: \n"; for (std::set::iterator i = ExternalObjectNames.begin(), @@ -344,7 +344,7 @@ O << "\t.global " << i << "\n\t.type " << i << ", @object\n"; } O << "\n\n"; - + return AsmPrinter::doFinalization(M); } @@ -356,5 +356,3 @@ IA64TargetMachine &tm) { return new IA64AsmPrinter(o, tm, tm.getTargetAsmInfo()); } - - From asl at math.spbu.ru Thu Aug 7 04:52:35 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:52:35 -0000 Subject: [llvm-commits] [llvm] r54453 - in /llvm/trunk/lib/Target/IA64: IA64AsmPrinter.cpp IA64TargetAsmInfo.cpp IA64TargetAsmInfo.h Message-ID: <200808070952.m779qZgf027527@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:52:35 2008 New Revision: 54453 URL: http://llvm.org/viewvc/llvm-project?rev=54453&view=rev Log: Switch IA64 to new section-handling stuff Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.cpp llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.h Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp?rev=54453&r1=54452&r2=54453&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Thu Aug 7 04:52:35 2008 @@ -109,6 +109,7 @@ void printMachineInstruction(const MachineInstr MI); void printOp(const MachineOperand &MO, bool isBRCALLinsn= false); + void printModuleLevelGV(const GlobalVariable GVar); bool runOnMachineFunction(MachineFunction &F); bool doInitialization(Module &M); bool doFinalization(Module &M); @@ -256,78 +257,92 @@ return Result; } -bool IA64AsmPrinter::doFinalization(Module &M) { +void IA64AsmPrinter::printModuleLevelGV(const GlobalVariable* GVar) { const TargetData TD = TM.getTargetData(); - // Print out module-level global variables here. - for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); - I != E; ++I) - if (I->hasInitializer()) { // External global require no code - // Check to see if this is a special global used by LLVM, if so, emit it. - if (EmitSpecialLLVMGlobal(I)) - continue; - - O << "\n\n"; - std::string name = Mang->getValueName(I); - Constant C = I->getInitializer(); - unsigned Size = TD->getABITypeSize(C->getType()); - unsigned Align = TD->getPreferredAlignmentLog(I); - - if (C->isNullValue() && - (I->hasLinkOnceLinkage() \|\| I->hasInternalLinkage() \|\| - I->hasCommonLinkage() \|\| - I->hasWeakLinkage() /* FIXME: Verify correct /)) { - SwitchToDataSection(".data", I); - if (I->hasInternalLinkage()) { - O << "\t.lcomm " << name << "#," << TD->getABITypeSize(C->getType()) - << "," << (1 << Align); - O << "\n"; - } else { - O << "\t.common " << name << "#," << TD->getABITypeSize(C->getType()) + if (!GVar->hasInitializer()) + return; // External global require no code + + // Check to see if this is a special global used by LLVM, if so, emit it. + if (EmitSpecialLLVMGlobal(GVar)) + return; + + O << "\n\n"; + std::string SectionName = TAI->SectionForGlobal(GVar); + std::string name = Mang->getValueName(GVar); + Constant C = GVar->getInitializer(); + unsigned Size = TD->getABITypeSize(C->getType()); + unsigned Align = TD->getPreferredAlignmentLog(GVar); + + // FIXME: ELF supports visibility + + SwitchToDataSection(SectionName.c_str()); + + if (C->isNullValue() && !GVar->hasSection()) { + if (!GVar->isThreadLocal() && + (GVar->hasInternalLinkage() \|\| GVar->isWeakForLinker())) { + if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. + + if (GVar->hasInternalLinkage()) { + O << "\t.lcomm " << name << "#," << Size << "," << (1 << Align); - O << "\n"; - } + O << "\n"; } else { - switch (I->getLinkage()) { - case GlobalValue::LinkOnceLinkage: - case GlobalValue::CommonLinkage: - case GlobalValue::WeakLinkage: // FIXME: Verify correct for weak. - // Nonnull linkonce -> weak - O << "\t.weak " << name << "\n"; - O << "\t.section\t.llvm.linkonce.d." << name - << ", \"aw\", \"progbits\"\n"; - SwitchToDataSection("", I); - break; - case GlobalValue::AppendingLinkage: - // FIXME: appending linkage variables should go into a section of - // their name or something. For now, just emit them as external. - case GlobalValue::ExternalLinkage: - // If external or appending, declare as a global symbol - O << "\t.global " << name << "\n"; - // FALL THROUGH - case GlobalValue::InternalLinkage: - SwitchToDataSection(C->isNullValue() ? ".bss" : ".data", I); - break; - case GlobalValue::GhostLinkage: - cerr << "GhostLinkage cannot appear in IA64AsmPrinter!\n"; - abort(); - case GlobalValue::DLLImportLinkage: - cerr << "DLLImport linkage is not supported by this target!\n"; - abort(); - case GlobalValue::DLLExportLinkage: - cerr << "DLLExport linkage is not supported by this target!\n"; - abort(); - default: - assert(0 && "Unknown linkage type!"); - } - - EmitAlignment(Align); - O << "\t.type " << name << ", at object\n"; - O << "\t.size " << name << "," << Size << "\n"; - O << name << ":\t\t\t\t// " << C << "\n"; - EmitGlobalConstant(C); + O << "\t.common " << name << "#," << Size + << "," << (1 << Align); + O << "\n"; } + + return; } + } + + switch (GVar->getLinkage()) { + case GlobalValue::LinkOnceLinkage: + case GlobalValue::CommonLinkage: + case GlobalValue::WeakLinkage: + // Nonnull linkonce -> weak + O << "\t.weak " << name << "\n"; + break; + case GlobalValue::AppendingLinkage: + // FIXME: appending linkage variables should go into a section of + // their name or something. For now, just emit them as external. + case GlobalValue::ExternalLinkage: + // If external or appending, declare as a global symbol + O << TAI->getGlobalDirective() << name << "\n"; + // FALL THROUGH + case GlobalValue::InternalLinkage: + break; + case GlobalValue::GhostLinkage: + cerr << "GhostLinkage cannot appear in IA64AsmPrinter!\n"; + abort(); + case GlobalValue::DLLImportLinkage: + cerr << "DLLImport linkage is not supported by this target!\n"; + abort(); + case GlobalValue::DLLExportLinkage: + cerr << "DLLExport linkage is not supported by this target!\n"; + abort(); + default: + assert(0 && "Unknown linkage type!"); + } + + EmitAlignment(Align); + + if (TAI->hasDotTypeDotSizeDirective()) { + O << "\t.type " << name << ", at object\n"; + O << "\t.size " << name << "," << Size << "\n"; + } + + O << name << ":\t\t\t\t// " << C << "\n"; + EmitGlobalConstant(C); +} + + +bool IA64AsmPrinter::doFinalization(Module &M) { + // Print out module-level global variables here. + for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); + I != E; ++I) + printModuleLevelGV(I); // we print out ".global X \n .type X, @function" for each external function O << "\n\n// br.call targets referenced (and not defined) above: \n"; Modified: llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.cpp?rev=54453&r1=54452&r2=54453&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.cpp Thu Aug 7 04:52:35 2008 @@ -15,7 +15,8 @@ using namespace llvm; -IA64TargetAsmInfo::IA64TargetAsmInfo(const IA64TargetMachine &TM) { +IA64TargetAsmInfo::IA64TargetAsmInfo(const TargetMachine &TM): + ELFTargetAsmInfo(TM) { CommentString = "//"; Data8bitsDirective = "\tdata1\t"; // FIXME: check that we are Data16bitsDirective = "\tdata2.ua\t"; // disabling auto-alignment @@ -28,7 +29,9 @@ GlobalVarAddrSuffix=""; FunctionAddrPrefix="@fptr("; FunctionAddrSuffix=")"; - + // FIXME: would be nice to have rodata (no 'w') when appropriate? ConstantPoolSection = "\n\t.section .data, \"aw\", \"progbits\"\n"; } + +// FIXME: Support small data/bss/rodata sections someday. Modified: llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.h?rev=54453&r1=54452&r2=54453&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.h (original) +++ llvm/trunk/lib/Target/IA64/IA64TargetAsmInfo.h Thu Aug 7 04:52:35 2008 @@ -15,14 +15,15 @@ #define IA64TARGETASMINFO_H #include "llvm/Target/TargetAsmInfo.h" +#include "llvm/Target/ELFTargetAsmInfo.h" namespace llvm { // Forward declaration. - class IA64TargetMachine; + class TargetMachine; - struct IA64TargetAsmInfo : public TargetAsmInfo { - explicit IA64TargetAsmInfo(const IA64TargetMachine &TM); + struct IA64TargetAsmInfo : public ELFTargetAsmInfo { + explicit IA64TargetAsmInfo(const TargetMachine &TM); }; From asl at math.spbu.ru Thu Aug 7 04:52:54 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:52:54 -0000 Subject: [llvm-commits] [llvm] r54454 - /llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Message-ID: <200808070952.m779qs9j027545@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:52:54 2008 New Revision: 54454 URL: http://llvm.org/viewvc/llvm-project?rev=54454&view=rev Log: Cleanup Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp?rev=54454&r1=54453&r2=54454&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Thu Aug 7 04:52:54 2008 @@ -141,7 +141,7 @@ // Print out labels for the function. EmitAlignment(5); - O << "\t.global\t" << CurrentFnName << "\n"; + O << "\t.global\t" << CurrentFnName << '\n'; O << "\t.type\t" << CurrentFnName << ", @function\n"; O << CurrentFnName << ":\n"; @@ -285,12 +285,12 @@ if (GVar->hasInternalLinkage()) { O << "\t.lcomm " << name << "#," << Size - << "," << (1 << Align); - O << "\n"; + << ',' << (1 << Align); + O << '\n'; } else { O << "\t.common " << name << "#," << Size - << "," << (1 << Align); - O << "\n"; + << ',' << (1 << Align); + O << '\n'; } return; @@ -302,14 +302,14 @@ case GlobalValue::CommonLinkage: case GlobalValue::WeakLinkage: // Nonnull linkonce -> weak - O << "\t.weak " << name << "\n"; + O << "\t.weak " << name << '\n'; break; case GlobalValue::AppendingLinkage: // FIXME: appending linkage variables should go into a section of // their name or something. For now, just emit them as external. case GlobalValue::ExternalLinkage: // If external or appending, declare as a global symbol - O << TAI->getGlobalDirective() << name << "\n"; + O << TAI->getGlobalDirective() << name << '\n'; // FALL THROUGH case GlobalValue::InternalLinkage: break; @@ -330,10 +330,10 @@ if (TAI->hasDotTypeDotSizeDirective()) { O << "\t.type " << name << ", at object\n"; - O << "\t.size " << name << "," << Size << "\n"; + O << "\t.size " << name << ',' << Size << '\n'; } - O << name << ":\t\t\t\t// " << C << "\n"; + O << name << ":\t\t\t\t// " << C << '\n'; EmitGlobalConstant(C); } From asl at math.spbu.ru Thu Aug 7 04:53:13 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:53:13 -0000 Subject: [llvm-commits] [llvm] r54455 - /llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Message-ID: <200808070953.m779rD95027569@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:53:13 2008 New Revision: 54455 URL: http://llvm.org/viewvc/llvm-project?rev=54455&view=rev Log: Cleanup Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp?rev=54455&r1=54454&r2=54455&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Thu Aug 7 04:53:13 2008 @@ -106,7 +106,7 @@ const Function F = MF.getFunction(); SwitchToTextSection(getSectionForFunction(F).c_str(), F); EmitAlignment(4, F); - O << "\t.globl\t" << CurrentFnName << "\n"; + O << "\t.globl\t" << CurrentFnName << '\n'; O << "\t.type\t" << CurrentFnName << ", #function\n"; O << CurrentFnName << ":\n"; @@ -259,7 +259,7 @@ if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. if (GVar->hasInternalLinkage()) - O << "\t.local " << name << "\n"; + O << "\t.local " << name << '\n'; O << TAI->getCOMMDirective() << name << ',' << Size; if (TAI->getCOMMDirectiveTakesAlignment()) @@ -275,14 +275,14 @@ case GlobalValue::LinkOnceLinkage: case GlobalValue::WeakLinkage: // FIXME: Verify correct for weak. // Nonnull linkonce -> weak - O << "\t.weak " << name << "\n"; + O << "\t.weak " << name << '\n'; break; case GlobalValue::AppendingLinkage: // FIXME: appending linkage variables should go into a section of // their name or something. For now, just emit them as external. case GlobalValue::ExternalLinkage: // If external or appending, declare as a global symbol - O << TAI->getGlobalDirective() << name << "\n"; + O << TAI->getGlobalDirective() << name << '\n'; // FALL THROUGH case GlobalValue::InternalLinkage: break; @@ -300,11 +300,11 @@ } if (Align) - O << "\t.align " << Align << "\n"; + O << "\t.align " << Align << '\n'; if (TAI->hasDotTypeDotSizeDirective()) { O << "\t.type " << name << ",#object\n"; - O << "\t.size " << name << "," << Size << "\n"; + O << "\t.size " << name << ',' << Size << '\n'; } O << name << ":\n"; From asl at math.spbu.ru Thu Aug 7 04:53:38 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:53:38 -0000 Subject: [llvm-commits] [llvm] r54456 - in /llvm/trunk/lib/Target: IA64/IA64AsmPrinter.cpp Mips/MipsAsmPrinter.cpp Sparc/SparcAsmPrinter.cpp Message-ID: <200808070953.m779rcS9027600@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:53:38 2008 New Revision: 54456 URL: http://llvm.org/viewvc/llvm-project?rev=54456&view=rev Log: Use EmitAlignment consistently Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp?rev=54456&r1=54455&r2=54456&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Thu Aug 7 04:53:38 2008 @@ -326,7 +326,7 @@ assert(0 && "Unknown linkage type!"); } - EmitAlignment(Align); + EmitAlignment(Align, GVar); if (TAI->hasDotTypeDotSizeDirective()) { O << "\t.type " << name << ", at object\n"; Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp?rev=54456&r1=54455&r2=54456&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp Thu Aug 7 04:53:38 2008 @@ -534,7 +534,7 @@ // Fall Through case GlobalValue::InternalLinkage: if (CVA && CVA->isCString()) - printSizeAndType = false; + printSizeAndType = false; break; case GlobalValue::GhostLinkage: cerr << "Should not have any unmaterialized functions!\n"; @@ -549,8 +549,7 @@ assert(0 && "Unknown linkage type!"); } - if (Align) - O << "\t.align " << Align << '\n'; + EmitAlignment(Align, GVar); if (TAI->hasDotTypeDotSizeDirective() && printSizeAndType) { O << "\t.type " << name << ", at object\n"; Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp?rev=54456&r1=54455&r2=54456&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Thu Aug 7 04:53:38 2008 @@ -299,8 +299,7 @@ assert(0 && "Unknown linkage type!"); } - if (Align) - O << "\t.align " << Align << '\n'; + EmitAlignment(Align, GVar); if (TAI->hasDotTypeDotSizeDirective()) { O << "\t.type " << name << ",#object\n"; From asl at math.spbu.ru Thu Aug 7 04:53:57 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:53:57 -0000 Subject: [llvm-commits] [llvm] r54457 - /llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp Message-ID: <200808070953.m779rvg7027624@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:53:57 2008 New Revision: 54457 URL: http://llvm.org/viewvc/llvm-project?rev=54457&view=rev Log: Switch Alpha to new section handling stuff Modified: llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp Modified: llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp?rev=54457&r1=54456&r2=54457&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp Thu Aug 7 04:53:57 2008 @@ -46,15 +46,16 @@ void printOp(const MachineOperand &MO, bool IsCallOp = false); void printOperand(const MachineInstr MI, int opNum); void printBaseOffsetPair (const MachineInstr MI, int i, bool brackets=true); + void printModuleLevelGV(const GlobalVariable* GVar); bool runOnMachineFunction(MachineFunction &F); bool doInitialization(Module &M); bool doFinalization(Module &M); - + bool PrintAsmOperand(const MachineInstr MI, unsigned OpNo, unsigned AsmVariant, const char ExtraCode); - bool PrintAsmMemoryOperand(const MachineInstr MI, + bool PrintAsmMemoryOperand(const MachineInstr MI, unsigned OpNo, - unsigned AsmVariant, + unsigned AsmVariant, const char ExtraCode); }; } // end of anonymous namespace @@ -148,7 +149,7 @@ // Print out labels for the function. const Function F = MF.getFunction(); SwitchToTextSection(getSectionForFunction(F).c_str(), F); - + EmitAlignment(4, F); switch (F->getLinkage()) { default: assert(0 && "Unknown linkage type!"); @@ -201,36 +202,38 @@ return AsmPrinter::doInitialization(M); } -bool AlphaAsmPrinter::doFinalization(Module &M) { +void AlphaAsmPrinter::printModuleLevelGV(const GlobalVariable GVar) { const TargetData TD = TM.getTargetData(); - for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I) { + if (!GVar->hasInitializer()) return; // External global require no code - if (!I->hasInitializer()) continue; // External global require no code - - // Check to see if this is a special global used by LLVM, if so, emit it. - if (EmitSpecialLLVMGlobal(I)) - continue; - - std::string name = Mang->getValueName(I); - Constant C = I->getInitializer(); - unsigned Size = TD->getABITypeSize(C->getType()); - unsigned Align = TD->getPreferredAlignmentLog(I); - - //1: hidden? - if (I->hasHiddenVisibility()) - O << TAI->getHiddenDirective() << name << "\n"; - - //2: kind - switch (I->getLinkage()) { - case GlobalValue::LinkOnceLinkage: - case GlobalValue::WeakLinkage: - case GlobalValue::CommonLinkage: - O << TAI->getWeakRefDirective() << name << '\n'; - break; - case GlobalValue::AppendingLinkage: - case GlobalValue::ExternalLinkage: - O << "\t.globl " << name << "\n"; + // Check to see if this is a special global used by LLVM, if so, emit it. + if (EmitSpecialLLVMGlobal(GVar)) + return; + + std::string SectionName = TAI->SectionForGlobal(GVar); + std::string name = Mang->getValueName(GVar); + Constant C = GVar->getInitializer(); + unsigned Size = TD->getABITypeSize(C->getType()); + unsigned Align = TD->getPreferredAlignmentLog(GVar); + + // 0: Switch to section + SwitchToDataSection(SectionName.c_str()); + + // 1: Check visibility + if (GVar->hasHiddenVisibility()) + O << TAI->getHiddenDirective() << name << "\n"; + + // 2: Kind + switch (GVar->getLinkage()) { + case GlobalValue::LinkOnceLinkage: + case GlobalValue::WeakLinkage: + case GlobalValue::CommonLinkage: + O << TAI->getWeakRefDirective() << name << '\n'; + break; + case GlobalValue::AppendingLinkage: + case GlobalValue::ExternalLinkage: + O << TAI->getGlobalDirective() << name << "\n"; break; case GlobalValue::InternalLinkage: break; @@ -239,53 +242,47 @@ cerr << "Unknown linkage type!\n"; abort(); } - - //3: Section (if changed) - if (I->hasSection() && - (I->getSection() == ".ctors" \|\| - I->getSection() == ".dtors")) { - std::string SectionName = ".section\t" + I->getSection() - + ",\"aw\", at progbits"; - SwitchToDataSection(SectionName.c_str()); - } else { - if (C->isNullValue()) - SwitchToDataSection("\t.section\t.bss", I); - else - SwitchToDataSection("\t.section\t.data", I); - } - - //4: Type, Size, Align + + // 3: Type, Size, Align + if (TAI->hasDotTypeDotSizeDirective()) { O << "\t.type\t" << name << ", @object\n"; O << "\t.size\t" << name << ", " << Size << "\n"; - EmitAlignment(Align, I); - - O << name << ":\n"; - - // If the initializer is a extern weak symbol, remember to emit the weak - // reference! - if (const GlobalValue GV = dyn_cast(C)) - if (GV->hasExternalWeakLinkage()) - ExtWeakSymbols.insert(GV); - - EmitGlobalConstant(C); - O << '\n'; } + EmitAlignment(Align, GVar); + + O << name << ":\n"; + + // If the initializer is a extern weak symbol, remember to emit the weak + // reference! + if (const GlobalValue GV = dyn_cast(C)) + if (GV->hasExternalWeakLinkage()) + ExtWeakSymbols.insert(GV); + + EmitGlobalConstant(C); + O << '\n'; +} + +bool AlphaAsmPrinter::doFinalization(Module &M) { + for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); + I != E; ++I) + printModuleLevelGV(I); + return AsmPrinter::doFinalization(M); } /// PrintAsmOperand - Print out an operand for an inline asm expression. /// bool AlphaAsmPrinter::PrintAsmOperand(const MachineInstr MI, unsigned OpNo, - unsigned AsmVariant, + unsigned AsmVariant, const char ExtraCode) { printOperand(MI, OpNo); return false; } -bool AlphaAsmPrinter::PrintAsmMemoryOperand(const MachineInstr MI, +bool AlphaAsmPrinter::PrintAsmMemoryOperand(const MachineInstr MI, unsigned OpNo, - unsigned AsmVariant, + unsigned AsmVariant, const char ExtraCode) { if (ExtraCode && ExtraCode[0]) return true; // Unknown modifier. From asl at math.spbu.ru Thu Aug 7 04:54:23 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:54:23 -0000 Subject: [llvm-commits] [llvm] r54458 - in /llvm/trunk/lib/Target: ARM/ARMAsmPrinter.cpp ARM/ARMTargetAsmInfo.cpp ARM/ARMTargetAsmInfo.h ARM/ARMTargetMachine.cpp X86/X86ATTAsmPrinter.cpp Message-ID: <200808070954.m779sO9i027662@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:54:23 2008 New Revision: 54458 URL: http://llvm.org/viewvc/llvm-project?rev=54458&view=rev Log: Switch ARM to new section handling stuff Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=54458&r1=54457&r2=54458&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Thu Aug 7 04:54:23 2008 @@ -113,12 +113,17 @@ virtual bool PrintAsmOperand(const MachineInstr MI, unsigned OpNo, unsigned AsmVariant, const char ExtraCode); + void printModuleLevelGV(const GlobalVariable* GVar); bool printInstruction(const MachineInstr MI); // autogenerated. void printMachineInstruction(const MachineInstr MI); bool runOnMachineFunction(MachineFunction &F); bool doInitialization(Module &M); bool doFinalization(Module &M); + /// getSectionForFunction - Return the section that we should emit the + /// specified function body into. + virtual std::string getSectionForFunction(const Function &F) const; + virtual void EmitMachineConstantPoolValue(MachineConstantPoolValue MCPV) { printDataDirective(MCPV->getType()); @@ -172,6 +177,11 @@ return new ARMAsmPrinter(o, tm, tm.getTargetAsmInfo()); } +// Substitute old hook with new one temporary +std::string ARMAsmPrinter::getSectionForFunction(const Function &F) const { + return TAI->SectionForGlobal(&F); +} + /// runOnMachineFunction - This uses the printInstruction() /// method to print assembly for each instruction. /// @@ -821,176 +831,127 @@ OS << Name; } -bool ARMAsmPrinter::doFinalization(Module &M) { +void ARMAsmPrinter::printModuleLevelGV(const GlobalVariable* GVar) { const TargetData TD = TM.getTargetData(); - for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); - I != E; ++I) { - if (!I->hasInitializer()) // External global require no code - continue; + if (!GVar->hasInitializer()) // External global require no code + return; - if (EmitSpecialLLVMGlobal(I)) { - if (Subtarget->isTargetDarwin() && - TM.getRelocationModel() == Reloc::Static) { - if (I->getName() == "llvm.global_ctors") - O << ".reference .constructors_used\n"; - else if (I->getName() == "llvm.global_dtors") - O << ".reference .destructors_used\n"; - } - continue; + // Check to see if this is a special global used by LLVM, if so, emit it. + + if (EmitSpecialLLVMGlobal(GVar)) { + if (Subtarget->isTargetDarwin() && + TM.getRelocationModel() == Reloc::Static) { + if (GVar->getName() == "llvm.global_ctors") + O << ".reference .constructors_used\n"; + else if (GVar->getName() == "llvm.global_dtors") + O << ".reference .destructors_used\n"; } + return; + } + + std::string SectionName = TAI->SectionForGlobal(GVar); + std::string name = Mang->getValueName(GVar); + Constant C = GVar->getInitializer(); + const Type Type = C->getType(); + unsigned Size = TD->getABITypeSize(Type); + unsigned Align = TD->getPreferredAlignmentLog(GVar); + + const char VisibilityDirective = NULL; + if (GVar->hasHiddenVisibility()) + VisibilityDirective = TAI->getHiddenDirective(); + else if (GVar->hasProtectedVisibility()) + VisibilityDirective = TAI->getProtectedDirective(); - std::string name = Mang->getValueName(I); - Constant C = I->getInitializer(); - const Type Type = C->getType(); - unsigned Size = TD->getABITypeSize(Type); - unsigned Align = TD->getPreferredAlignmentLog(I); - - const char VisibilityDirective = NULL; - if (I->hasHiddenVisibility()) - VisibilityDirective = TAI->getHiddenDirective(); - else if (I->hasProtectedVisibility()) - VisibilityDirective = TAI->getProtectedDirective(); + if (VisibilityDirective) + O << VisibilityDirective << name << "\n"; - if (VisibilityDirective) - O << VisibilityDirective << name << "\n"; + if (Subtarget->isTargetELF()) + O << "\t.type " << name << ",%object\n"; - if (Subtarget->isTargetELF()) - O << "\t.type " << name << ",%object\n"; - - if (C->isNullValue() && !I->hasSection() && !I->isThreadLocal()) { - if (I->hasExternalLinkage()) { - if (const char Directive = TAI->getZeroFillDirective()) { - O << "\t.globl\t" << name << "\n"; - O << Directive << "__DATA, __common, " << name << ", " - << Size << ", " << Align << "\n"; - continue; - } - } + SwitchToDataSection(SectionName.c_str()); - if (I->hasInternalLinkage() \|\| I->hasWeakLinkage() \|\| - I->hasLinkOnceLinkage()) { - if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. - if (!NoZerosInBSS && TAI->getBSSSection()) - SwitchToDataSection(TAI->getBSSSection(), I); - else - SwitchToDataSection(TAI->getDataSection(), I); - if (TAI->getLCOMMDirective() != NULL) { - if (I->hasInternalLinkage()) { - O << TAI->getLCOMMDirective() << name << "," << Size; - if (Subtarget->isTargetDarwin()) - O << "," << Align; - } else - O << TAI->getCOMMDirective() << name << "," << Size; - } else { - if (I->hasInternalLinkage()) - O << "\t.local\t" << name << "\n"; - O << TAI->getCOMMDirective() << name << "," << Size; - if (TAI->getCOMMDirectiveTakesAlignment()) - O << "," << (TAI->getAlignmentIsInBytes() ? (1 << Align) : Align); - } - O << "\t\t" << TAI->getCommentString() << " "; - PrintUnmangledNameSafely(I, O); - O << "\n"; - continue; + if (C->isNullValue() && !GVar->hasSection() && !GVar->isThreadLocal()) { + // FIXME: This seems to be pretty darwin-specific + + if (GVar->hasExternalLinkage()) { + if (const char Directive = TAI->getZeroFillDirective()) { + O << "\t.globl\t" << name << "\n"; + O << Directive << "__DATA, __common, " << name << ", " + << Size << ", " << Align << "\n"; + return; } } - switch (I->getLinkage()) { - case GlobalValue::LinkOnceLinkage: - case GlobalValue::WeakLinkage: - if (Subtarget->isTargetDarwin()) { - O << "\t.globl " << name << "\n" - << "\t.weak_definition " << name << "\n"; - SwitchToDataSection("\t.section __DATA,__datacoal_nt,coalesced", I); - } else { - std::string SectionName("\t.section\t.llvm.linkonce.d." + - name + - ",\"aw\",%progbits"); - SwitchToDataSection(SectionName.c_str(), I); - O << "\t.weak " << name << "\n"; - } - break; - case GlobalValue::AppendingLinkage: - // FIXME: appending linkage variables should go into a section of - // their name or something. For now, just emit them as external. - case GlobalValue::ExternalLinkage: - O << "\t.globl " << name << "\n"; - // FALL THROUGH - case GlobalValue::InternalLinkage: { - if (I->isConstant()) { - const ConstantArray CVA = dyn_cast(C); - if (TAI->getCStringSection() && CVA && CVA->isCString()) { - SwitchToDataSection(TAI->getCStringSection(), I); - break; - } - } - // FIXME: special handling for ".ctors" & ".dtors" sections - if (I->hasSection() && - (I->getSection() == ".ctors" \|\| - I->getSection() == ".dtors")) { - assert(!Subtarget->isTargetDarwin()); - std::string SectionName = ".section " + I->getSection(); - SectionName += ",\"aw\",%progbits"; - SwitchToDataSection(SectionName.c_str()); - } else if (I->hasSection() && Subtarget->isTargetDarwin()) { - // Honor all section names on Darwin; ObjC uses this - std::string SectionName = ".section " + I->getSection(); - SwitchToDataSection(SectionName.c_str()); + if (GVar->hasInternalLinkage() \|\| GVar->isWeakForLinker()) { + if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. + + if (TAI->getLCOMMDirective() != NULL) { + if (GVar->hasInternalLinkage()) { + O << TAI->getLCOMMDirective() << name << "," << Size; + if (Subtarget->isTargetDarwin()) + O << "," << Align; + } else + O << TAI->getCOMMDirective() << name << "," << Size; } else { - if (C->isNullValue() && !NoZerosInBSS && TAI->getBSSSection()) - SwitchToDataSection(I->isThreadLocal() ? TAI->getTLSBSSSection() : - TAI->getBSSSection(), I); - else if (!I->isConstant()) - SwitchToDataSection(I->isThreadLocal() ? TAI->getTLSDataSection() : - TAI->getDataSection(), I); - else if (I->isThreadLocal()) - SwitchToDataSection(TAI->getTLSDataSection()); - else { - // Read-only data. - bool HasReloc = C->ContainsRelocations(); - if (HasReloc && - Subtarget->isTargetDarwin() && - TM.getRelocationModel() != Reloc::Static) - SwitchToDataSection("\t.const_data\n"); - else if (!HasReloc && Size == 4 && - TAI->getFourByteConstantSection()) - SwitchToDataSection(TAI->getFourByteConstantSection(), I); - else if (!HasReloc && Size == 8 && - TAI->getEightByteConstantSection()) - SwitchToDataSection(TAI->getEightByteConstantSection(), I); - else if (!HasReloc && Size == 16 && - TAI->getSixteenByteConstantSection()) - SwitchToDataSection(TAI->getSixteenByteConstantSection(), I); - else if (TAI->getReadOnlySection()) - SwitchToDataSection(TAI->getReadOnlySection(), I); - else - SwitchToDataSection(TAI->getDataSection(), I); - } + if (GVar->hasInternalLinkage()) + O << "\t.local\t" << name << "\n"; + O << TAI->getCOMMDirective() << name << "," << Size; + if (TAI->getCOMMDirectiveTakesAlignment()) + O << "," << (TAI->getAlignmentIsInBytes() ? (1 << Align) : Align); } - - break; + O << "\t\t" << TAI->getCommentString() << " "; + PrintUnmangledNameSafely(GVar, O); + O << "\n"; + return; } - default: - assert(0 && "Unknown linkage type!"); - break; + } + + switch (GVar->getLinkage()) { + case GlobalValue::LinkOnceLinkage: + case GlobalValue::WeakLinkage: + if (Subtarget->isTargetDarwin()) { + O << "\t.globl " << name << "\n" + << "\t.weak_definition " << name << "\n"; + } else { + O << "\t.weak " << name << "\n"; } + break; + case GlobalValue::AppendingLinkage: + // FIXME: appending linkage variables should go into a section of + // their name or something. For now, just emit them as external. + case GlobalValue::ExternalLinkage: + O << "\t.globl " << name << "\n"; + // FALL THROUGH + case GlobalValue::InternalLinkage: + break; + default: + assert(0 && "Unknown linkage type!"); + break; + } - EmitAlignment(Align, I); - O << name << ":\t\t\t\t" << TAI->getCommentString() << " "; - PrintUnmangledNameSafely(I, O); - O << "\n"; - if (TAI->hasDotTypeDotSizeDirective()) - O << "\t.size " << name << ", " << Size << "\n"; - // If the initializer is a extern weak symbol, remember to emit the weak - // reference! - if (const GlobalValue GV = dyn_cast(C)) - if (GV->hasExternalWeakLinkage()) + EmitAlignment(Align, GVar); + O << name << ":\t\t\t\t" << TAI->getCommentString() << " "; + PrintUnmangledNameSafely(GVar, O); + O << "\n"; + if (TAI->hasDotTypeDotSizeDirective()) + O << "\t.size " << name << ", " << Size << "\n"; + + // If the initializer is a extern weak symbol, remember to emit the weak + // reference! + if (const GlobalValue GV = dyn_cast(C)) + if (GV->hasExternalWeakLinkage()) ExtWeakSymbols.insert(GV); - EmitGlobalConstant(C); - O << '\n'; - } + EmitGlobalConstant(C); + O << '\n'; +} + + +bool ARMAsmPrinter::doFinalization(Module &M) { + for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); + I != E; ++I) + printModuleLevelGV(I); if (Subtarget->isTargetDarwin()) { SwitchToDataSection(""); Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp?rev=54458&r1=54457&r2=54458&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.cpp Thu Aug 7 04:54:23 2008 @@ -43,85 +43,8 @@ 0,0}; ARMTargetAsmInfo::ARMTargetAsmInfo(const ARMTargetMachine &TM) { - Subtarget = &TM.getSubtarget(); AsmTransCBE = arm_asm_table; - if (Subtarget->isTargetDarwin()) { - GlobalPrefix = "_"; - PrivateGlobalPrefix = "L"; - StringConstantPrefix = "\1LC"; - BSSSection = 0; // no BSS section. - ZeroFillDirective = "\t.zerofill\t"; // Uses .zerofill - SetDirective = "\t.set\t"; - WeakRefDirective = "\t.weak_reference\t"; - HiddenDirective = "\t.private_extern\t"; - ProtectedDirective = NULL; - JumpTableDataSection = ".const"; - CStringSection = "\t.cstring"; - FourByteConstantSection = "\t.literal4\n"; - EightByteConstantSection = "\t.literal8\n"; - ReadOnlySection = "\t.const\n"; - HasDotTypeDotSizeDirective = false; - NeedsIndirectEncoding = true; - if (TM.getRelocationModel() == Reloc::Static) { - StaticCtorsSection = ".constructor"; - StaticDtorsSection = ".destructor"; - } else { - StaticCtorsSection = ".mod_init_func"; - StaticDtorsSection = ".mod_term_func"; - } - - // In non-PIC modes, emit a special label before jump tables so that the - // linker can perform more accurate dead code stripping. - if (TM.getRelocationModel() != Reloc::PIC_) { - // Emit a local label that is preserved until the linker runs. - JumpTableSpecialLabelPrefix = "l"; - } - - NeedsSet = true; - DwarfAbbrevSection = ".section __DWARF,__debug_abbrev,regular,debug"; - DwarfInfoSection = ".section __DWARF,__debug_info,regular,debug"; - DwarfLineSection = ".section __DWARF,__debug_line,regular,debug"; - DwarfFrameSection = ".section __DWARF,__debug_frame,regular,debug"; - DwarfPubNamesSection = ".section __DWARF,__debug_pubnames,regular,debug"; - DwarfPubTypesSection = ".section __DWARF,__debug_pubtypes,regular,debug"; - DwarfStrSection = ".section __DWARF,__debug_str,regular,debug"; - DwarfLocSection = ".section __DWARF,__debug_loc,regular,debug"; - DwarfARangesSection = ".section __DWARF,__debug_aranges,regular,debug"; - DwarfRangesSection = ".section __DWARF,__debug_ranges,regular,debug"; - DwarfMacInfoSection = ".section __DWARF,__debug_macinfo,regular,debug"; - } else { - NeedsSet = false; - HasLEB128 = true; - AbsoluteDebugSectionOffsets = true; - ReadOnlySection = "\t.section\t.rodata\n"; - PrivateGlobalPrefix = ".L"; - WeakRefDirective = "\t.weak\t"; - SetDirective = "\t.set\t"; - DwarfRequiresFrameSection = false; - DwarfAbbrevSection = "\t.section\t.debug_abbrev,\"\",%progbits"; - DwarfInfoSection = "\t.section\t.debug_info,\"\",%progbits"; - DwarfLineSection = "\t.section\t.debug_line,\"\",%progbits"; - DwarfFrameSection = "\t.section\t.debug_frame,\"\",%progbits"; - DwarfPubNamesSection ="\t.section\t.debug_pubnames,\"\",%progbits"; - DwarfPubTypesSection ="\t.section\t.debug_pubtypes,\"\",%progbits"; - DwarfStrSection = "\t.section\t.debug_str,\"\",%progbits"; - DwarfLocSection = "\t.section\t.debug_loc,\"\",%progbits"; - DwarfARangesSection = "\t.section\t.debug_aranges,\"\",%progbits"; - DwarfRangesSection = "\t.section\t.debug_ranges,\"\",%progbits"; - DwarfMacInfoSection = "\t.section\t.debug_macinfo,\"\",%progbits"; - - if (Subtarget->isAAPCS_ABI()) { - StaticCtorsSection = "\t.section .init_array,\"aw\",%init_array"; - StaticDtorsSection = "\t.section .fini_array,\"aw\",%fini_array"; - } else { - StaticCtorsSection = "\t.section .ctors,\"aw\",%progbits"; - StaticDtorsSection = "\t.section .dtors,\"aw\",%progbits"; - } - TLSDataSection = "\t.section .tdata,\"awT\",%progbits"; - TLSBSSSection = "\t.section .tbss,\"awT\",%nobits"; - } - ZeroDirective = "\t.space\t"; AlignmentIsInBytes = false; Data64bitsDirective = 0; CommentString = "@"; @@ -133,6 +56,95 @@ LCOMMDirective = "\t.lcomm\t"; } +ARMDarwinTargetAsmInfo::ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM): + ARMTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) { + Subtarget = &DTM->getSubtarget(); + + GlobalPrefix = "_"; + PrivateGlobalPrefix = "L"; + StringConstantPrefix = "\1LC"; + BSSSection = 0; // no BSS section + ZeroDirective = "\t.space\t"; + ZeroFillDirective = "\t.zerofill\t"; // Uses .zerofill + SetDirective = "\t.set\t"; + WeakRefDirective = "\t.weak_reference\t"; + HiddenDirective = "\t.private_extern\t"; + ProtectedDirective = NULL; + JumpTableDataSection = ".const"; + CStringSection = "\t.cstring"; + FourByteConstantSection = "\t.literal4\n"; + EightByteConstantSection = "\t.literal8\n"; + ReadOnlySection = "\t.const\n"; + HasDotTypeDotSizeDirective = false; + NeedsIndirectEncoding = true; + if (TM.getRelocationModel() == Reloc::Static) { + StaticCtorsSection = ".constructor"; + StaticDtorsSection = ".destructor"; + } else { + StaticCtorsSection = ".mod_init_func"; + StaticDtorsSection = ".mod_term_func"; + } + + // In non-PIC modes, emit a special label before jump tables so that the + // linker can perform more accurate dead code stripping. + if (TM.getRelocationModel() != Reloc::PIC_) { + // Emit a local label that is preserved until the linker runs. + JumpTableSpecialLabelPrefix = "l"; + } + + NeedsSet = true; + DwarfAbbrevSection = ".section __DWARF,__debug_abbrev,regular,debug"; + DwarfInfoSection = ".section __DWARF,__debug_info,regular,debug"; + DwarfLineSection = ".section __DWARF,__debug_line,regular,debug"; + DwarfFrameSection = ".section __DWARF,__debug_frame,regular,debug"; + DwarfPubNamesSection = ".section __DWARF,__debug_pubnames,regular,debug"; + DwarfPubTypesSection = ".section __DWARF,__debug_pubtypes,regular,debug"; + DwarfStrSection = ".section __DWARF,__debug_str,regular,debug"; + DwarfLocSection = ".section __DWARF,__debug_loc,regular,debug"; + DwarfARangesSection = ".section __DWARF,__debug_aranges,regular,debug"; + DwarfRangesSection = ".section __DWARF,__debug_ranges,regular,debug"; + DwarfMacInfoSection = ".section __DWARF,__debug_macinfo,regular,debug"; +} + +ARMELFTargetAsmInfo::ARMELFTargetAsmInfo(const ARMTargetMachine &TM): + ARMTargetAsmInfo(TM), ELFTargetAsmInfo(TM) { + Subtarget = &ETM->getSubtarget(); + + NeedsSet = false; + HasLEB128 = true; + AbsoluteDebugSectionOffsets = true; + CStringSection = ".rodata.str"; + ReadOnlySection = "\t.section\t.rodata\n"; + FourByteConstantSection = "\t.section\t.rodata.cst4,\"aM\", at progbits,4"; + EightByteConstantSection = "\t.section\t.rodata.cst8,\"aM\", at progbits,8"; + SixteenByteConstantSection = "\t.section\t.rodata.cst16,\"aM\", at progbits,16"; + PrivateGlobalPrefix = ".L"; + WeakRefDirective = "\t.weak\t"; + SetDirective = "\t.set\t"; + DwarfRequiresFrameSection = false; + DwarfAbbrevSection = "\t.section\t.debug_abbrev,\"\",%progbits"; + DwarfInfoSection = "\t.section\t.debug_info,\"\",%progbits"; + DwarfLineSection = "\t.section\t.debug_line,\"\",%progbits"; + DwarfFrameSection = "\t.section\t.debug_frame,\"\",%progbits"; + DwarfPubNamesSection ="\t.section\t.debug_pubnames,\"\",%progbits"; + DwarfPubTypesSection ="\t.section\t.debug_pubtypes,\"\",%progbits"; + DwarfStrSection = "\t.section\t.debug_str,\"\",%progbits"; + DwarfLocSection = "\t.section\t.debug_loc,\"\",%progbits"; + DwarfARangesSection = "\t.section\t.debug_aranges,\"\",%progbits"; + DwarfRangesSection = "\t.section\t.debug_ranges,\"\",%progbits"; + DwarfMacInfoSection = "\t.section\t.debug_macinfo,\"\",%progbits"; + + if (Subtarget->isAAPCS_ABI()) { + StaticCtorsSection = "\t.section .init_array,\"aw\",%init_array"; + StaticDtorsSection = "\t.section .fini_array,\"aw\",%fini_array"; + } else { + StaticCtorsSection = "\t.section .ctors,\"aw\",%progbits"; + StaticDtorsSection = "\t.section .dtors,\"aw\",%progbits"; + } + TLSDataSection = "\t.section .tdata,\"awT\",%progbits"; + TLSBSSSection = "\t.section .tbss,\"awT\",%nobits"; +} + /// Count the number of comma-separated arguments. /// Do not try to detect errors. unsigned ARMTargetAsmInfo::countArguments(const char* p) const { Modified: llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h?rev=54458&r1=54457&r2=54458&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h (original) +++ llvm/trunk/lib/Target/ARM/ARMTargetAsmInfo.h Thu Aug 7 04:54:23 2008 @@ -15,6 +15,9 @@ #define ARMTARGETASMINFO_H #include "llvm/Target/TargetAsmInfo.h" +#include "llvm/Target/ELFTargetAsmInfo.h" +#include "llvm/Target/DarwinTargetAsmInfo.h" + #include "ARMSubtarget.h" namespace llvm { @@ -22,7 +25,7 @@ // Forward declaration. class ARMTargetMachine; - struct ARMTargetAsmInfo : public TargetAsmInfo { + struct ARMTargetAsmInfo : public virtual TargetAsmInfo { explicit ARMTargetAsmInfo(const ARMTargetMachine &TM); const ARMSubtarget Subtarget; @@ -32,6 +35,15 @@ unsigned countString(const char p) const; }; + struct ARMDarwinTargetAsmInfo : public virtual ARMTargetAsmInfo, + public virtual DarwinTargetAsmInfo { + explicit ARMDarwinTargetAsmInfo(const ARMTargetMachine &TM); + }; + + struct ARMELFTargetAsmInfo : public virtual ARMTargetAsmInfo, + public virtual ELFTargetAsmInfo { + explicit ARMELFTargetAsmInfo(const ARMTargetMachine &TM); + }; } // namespace llvm Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=54458&r1=54457&r2=54458&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Thu Aug 7 04:54:23 2008 @@ -58,7 +58,7 @@ return getJITMatchQuality()/2; } -ThumbTargetMachine::ThumbTargetMachine(const Module &M, const std::string &FS) +ThumbTargetMachine::ThumbTargetMachine(const Module &M, const std::string &FS) : ARMTargetMachine(M, FS, true) { } @@ -110,7 +110,14 @@ const TargetAsmInfo ARMTargetMachine::createTargetAsmInfo() const { - return new ARMTargetAsmInfo(this); + switch (Subtarget.TargetType) { + case ARMSubtarget::isDarwin: + return new ARMDarwinTargetAsmInfo(this); + case ARMSubtarget::isELF: + return new ARMELFTargetAsmInfo(this); + default: + return new ARMTargetAsmInfo(this); + } } @@ -124,7 +131,7 @@ // FIXME: temporarily disabling load / store optimization pass for Thumb mode. if (!Fast && !DisableLdStOpti && !Subtarget.isThumb()) PM.add(createARMLoadStoreOptimizationPass()); - + if (!Fast && !DisableIfConversion && !Subtarget.isThumb()) PM.add(createIfConverterPass()); @@ -132,7 +139,7 @@ return true; } -bool ARMTargetMachine::addAssemblyEmitter(PassManagerBase &PM, bool Fast, +bool ARMTargetMachine::addAssemblyEmitter(PassManagerBase &PM, bool Fast, std::ostream &Out) { // Output assembly language. PM.add(createARMCodePrinterPass(Out, this)); Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp?rev=54458&r1=54457&r2=54458&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Thu Aug 7 04:54:23 2008 @@ -754,8 +754,6 @@ if (!GVar->hasInitializer()) return; // External global require no code - std::string SectionName = TAI->SectionForGlobal(GVar); - // Check to see if this is a special global used by LLVM, if so, emit it. if (EmitSpecialLLVMGlobal(GVar)) { if (Subtarget->isTargetDarwin() && @@ -768,6 +766,7 @@ return; } + std::string SectionName = TAI->SectionForGlobal(GVar); std::string name = Mang->getValueName(GVar); Constant C = GVar->getInitializer(); const Type Type = C->getType(); From asl at math.spbu.ru Thu Aug 7 04:54:40 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:54:40 -0000 Subject: [llvm-commits] [llvm] r54459 - /llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Message-ID: <200808070954.m779sfFk027692@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:54:40 2008 New Revision: 54459 URL: http://llvm.org/viewvc/llvm-project?rev=54459&view=rev Log: Add assertion for easy debugging of missing stuff Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=54459&r1=54458&r2=54459&view=diff ============================================================================== --- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Thu Aug 7 04:54:40 2008 @@ -130,6 +130,8 @@ unsigned Size = TD->getABITypeSize(Ty); if (Size <= 16) { + assert(getCStringSection() && "Should have string section prefix"); + // We also need alignment here const TargetData TD = ETM->getTargetData(); unsigned Align = TD->getPrefTypeAlignment(Ty); From asl at math.spbu.ru Thu Aug 7 04:55:06 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:55:06 -0000 Subject: [llvm-commits] [llvm] r54460 - in /llvm/trunk: lib/Target/ELFTargetAsmInfo.cpp test/CodeGen/ARM/section.ll Message-ID: <200808070955.m779t6U8027713@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:55:06 2008 New Revision: 54460 URL: http://llvm.org/viewvc/llvm-project?rev=54460&view=rev Log: Print section flags ok on platforms, which use '@' as comment string. Fix test. Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp llvm/trunk/test/CodeGen/ARM/section.ll Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=54460&r1=54459&r2=54460&view=diff ============================================================================== --- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Thu Aug 7 04:55:06 2008 @@ -166,13 +166,19 @@ if (flags & SectionFlags::Small) Flags += 's'; - Flags += "\""; + Flags += "\","; + + // If comment string is '@', e.g. as on ARM - use '%' instead + if (strcmp(CommentString, "@") == 0) + Flags += '%'; + else + Flags += '@'; // FIXME: There can be exceptions here if (flags & SectionFlags::BSS) - Flags += ", at nobits"; + Flags += "nobits"; else - Flags += ", at progbits"; + Flags += "progbits"; if (unsigned entitySize = SectionFlags::getEntitySize(flags)) Flags += "," + utostr(entitySize); Modified: llvm/trunk/test/CodeGen/ARM/section.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/section.ll?rev=54460&r1=54459&r2=54460&view=diff ============================================================================== --- llvm/trunk/test/CodeGen/ARM/section.ll (original) +++ llvm/trunk/test/CodeGen/ARM/section.ll Thu Aug 7 04:55:06 2008 @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s \| llc -mtriple=arm-linux \| \ ; RUN: grep {__DTOR_END__:} ; RUN: llvm-as < %s \| llc -mtriple=arm-linux \| \ -; RUN: grep {.section .dtors,"aw",.progbits} +; RUN: grep {\\.section.\\.dtors,"aw",.progbits} @__DTOR_END__ = internal global [1 x i32] zeroinitializer, section ".dtors" ; <[1 x i32]> [#uses=0] From asl at math.spbu.ru Thu Aug 7 04:55:25 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Thu, 07 Aug 2008 09:55:25 -0000 Subject: [llvm-commits] [llvm] r54461 - /llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Message-ID: <200808070955.m779tP9E027736@zion.cs.uiuc.edu> Author: asl Date: Thu Aug 7 04:55:25 2008 New Revision: 54461 URL: http://llvm.org/viewvc/llvm-project?rev=54461&view=rev Log: Remove dead forward decl Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h?rev=54461&r1=54460&r2=54461&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h (original) +++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.h Thu Aug 7 04:55:25 2008 @@ -22,7 +22,6 @@ // Forward declaration. class X86TargetMachine; - class GlobalVariable; struct X86TargetAsmInfo : public virtual TargetAsmInfo { explicit X86TargetAsmInfo(const X86TargetMachine &TM); From isanbard at gmail.com Thu Aug 7 05:23:17 2008 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 7 Aug 2008 03:23:17 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54327 - in /llvm-gcc-4.2/trunk/libcpp: ChangeLog.apple charset.c In-Reply-To: <200808071130.59015.baldrick@free.fr> References: <200808042005.m74K5VhN025172@zion.cs.uiuc.edu> <200808062243.15576.baldrick@free.fr> <16e5fdf90808061352i7f5c6a40v5ee120a1da706d84@mail.gmail.com> <200808071130.59015.baldrick@free.fr> Message-ID: <90EA9765-14A0-41D2-AB0E-DACAA2D26F21@gmail.com> On Aug 7, 2008, at 2:30 AM, Duncan Sands wrote: >> I'm not sure exactly what to do in this situation, or what the code >> expects down the line. If the code has been there for awhile, I would >> err on the side of caution and just keep it like it is. What do you >> think? > > The code that enlarges the buffer and sets the size has been there > for a > million years, so let's leave it alone. > Sounds good to me. :-) -bw From matthijs at stdin.nl Thu Aug 7 04:00:51 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Thu, 07 Aug 2008 09:00:51 -0000 Subject: [llvm-commits] [llvm] r54447 - /llvm/trunk/include/llvm/Target/TargetData.h Message-ID: <200808070900.m7790qnI025297@zion.cs.uiuc.edu> Author: matthijs Date: Thu Aug 7 04:00:46 2008 New Revision: 54447 URL: http://llvm.org/viewvc/llvm-project?rev=54447&view=rev Log: Remove trailing spaces. Modified: llvm/trunk/include/llvm/Target/TargetData.h Modified: llvm/trunk/include/llvm/Target/TargetData.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetData.h?rev=54447&r1=54446&r2=54447&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetData.h (original) +++ llvm/trunk/include/llvm/Target/TargetData.h Thu Aug 7 04:00:46 2008 @@ -114,9 +114,9 @@ "Tool did not specify a TargetData to use?"); abort(); } - + /// Constructs a TargetData from a specification string. See init(). - explicit TargetData(const std::string &TargetDescription) + explicit TargetData(const std::string &TargetDescription) : ImmutablePass(intptr_t(&ID)) { init(TargetDescription); } @@ -124,7 +124,7 @@ /// Initialize target data from properties stored in the module. explicit TargetData(const Module M); - TargetData(const TargetData &TD) : + TargetData(const TargetData &TD) : ImmutablePass(intptr_t(&ID)), LittleEndian(TD.isLittleEndian()), PointerMemSize(TD.PointerMemSize), @@ -137,7 +137,7 @@ //! Parse a target data layout string and initialize TargetData alignments. void init(const std::string &TargetDescription); - + /// Target endianness... bool isLittleEndian() const { return LittleEndian; } bool isBigEndian() const { return !LittleEndian; } @@ -218,12 +218,12 @@ /// uint64_t getIndexedOffset(const Type Ty, Value* const* Indices, unsigned NumIndices) const; - + /// getStructLayout - Return a StructLayout object, indicating the alignment /// of the struct, its size, and the offsets of its fields. Note that this /// information is lazily cached. const StructLayout getStructLayout(const StructType Ty) const; - + /// InvalidateStructLayoutInfo - TargetData speculatively caches StructLayout /// objects. If a TargetData object is alive when types are being refined and /// removed, this method must be called whenever a StructType is removed to @@ -256,7 +256,7 @@ uint64_t getSizeInBytes() const { return StructSize; } - + uint64_t getSizeInBits() const { return 8StructSize; } @@ -264,7 +264,7 @@ unsigned getAlignment() const { return StructAlignment; } - + /// getElementContainingOffset - Given a valid offset into the structure, /// return the structure index that contains it. /// From matthijs at stdin.nl Thu Aug 7 08:36:32 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Thu, 07 Aug 2008 13:36:32 -0000 Subject: [llvm-commits] [llvm] r54462 - /llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Message-ID: <200808071336.m77DaXR1002203@zion.cs.uiuc.edu> Author: matthijs Date: Thu Aug 7 08:36:30 2008 New Revision: 54462 URL: http://llvm.org/viewvc/llvm-project?rev=54462&view=rev Log: Silence a warning. Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Modified: llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h?rev=54462&r1=54461&r2=54462&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h (original) +++ llvm/trunk/include/llvm/CodeGen/LiveIntervalAnalysis.h Thu Aug 7 08:36:30 2008 @@ -185,7 +185,7 @@ /// of instructions in a given LiveInterval. unsigned getApproximateInstructionCount(LiveInterval& I) { double IntervalPercentage = getScaledIntervalSize(I) / 1000.0; - return IntervalPercentage FunctionSize; + return (unsigned)(IntervalPercentage * FunctionSize); } /// getMBBFromIndex - given an index in any instruction of an From matthijs at stdin.nl Thu Aug 7 10:14:06 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Thu, 07 Aug 2008 15:14:06 -0000 Subject: [llvm-commits] [llvm] r54464 - /llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Message-ID: <200808071514.m77FE6bZ005377@zion.cs.uiuc.edu> Author: matthijs Date: Thu Aug 7 10:14:04 2008 New Revision: 54464 URL: http://llvm.org/viewvc/llvm-project?rev=54464&view=rev Log: Add some debug output to SRETPromotion. Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp?rev=54464&r1=54463&r2=54464&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Thu Aug 7 10:14:04 2008 @@ -89,6 +89,8 @@ if (F->arg_size() == 0 \|\| !F->hasStructRetAttr() \|\| F->doesNotReturn()) return false; + DOUT << "SretPromotion: Looking at sret function " << F->getNameStart() << "\n"; + assert (F->getReturnType() == Type::VoidTy && "Invalid function return type"); Function::arg_iterator AI = F->arg_begin(); const llvm::PointerType FArgType = dyn_cast(AI->getType()); @@ -99,10 +101,12 @@ // Check if it is ok to perform this promotion. if (isSafeToUpdateAllCallers(F) == false) { + DOUT << "SretPromotion: Not all callers can be updated\n"; NumRejectedSRETUses++; return false; } + DOUT << "SretPromotion: sret argument will be promoted\n"; NumSRET++; // [1] Replace use of sret parameter AllocaInst TheAlloca = new AllocaInst (STy, NULL, "mrv", From matthijs at stdin.nl Thu Aug 7 10:36:47 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Thu, 07 Aug 2008 15:36:47 -0000 Subject: [llvm-commits] [llvm] r54465 - in /llvm/trunk/test/Transforms: Inline/2008-03-07-Inline-2.ll Inline/2008-03-07-Inline.ll SRETPromotion/2008-03-07-Inline-2.ll SRETPromotion/2008-03-07-Inline.ll Message-ID: <200808071536.m77FalIs006016@zion.cs.uiuc.edu> Author: matthijs Date: Thu Aug 7 10:36:46 2008 New Revision: 54465 URL: http://llvm.org/viewvc/llvm-project?rev=54465&view=rev Log: Move two tests from SRETPromotion to Inline, since they only call opt -inline. Added: llvm/trunk/test/Transforms/Inline/2008-03-07-Inline-2.ll - copied unchanged from r54407, llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline-2.ll llvm/trunk/test/Transforms/Inline/2008-03-07-Inline.ll - copied unchanged from r54407, llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline.ll Removed: llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline-2.ll llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline.ll Removed: llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline-2.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline-2.ll?rev=54464&view=auto ============================================================================== --- llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline-2.ll (original) +++ llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline-2.ll (removed) @@ -1,53 +0,0 @@ -; RUN: llvm-as < %s \| opt -inline -disable-output - %struct.Demand = type { double, double } - %struct.branch = type { %struct.Demand, double, double, double, double, %struct.branch, [12 x %struct.leaf] } - %struct.leaf = type { %struct.Demand, double, double } - at P = external global double ; [#uses=1] - -define %struct.leaf* @build_leaf() nounwind { -entry: - unreachable -} - -define %struct.Demand @Compute_Branch2(%struct.branch* %br, double %theta_R, double %theta_I, double %pi_R, double %pi_I) nounwind { -entry: - %mrv = alloca %struct.Demand ; <%struct.Demand> [#uses=4] - %a2 = alloca %struct.Demand ; <%struct.Demand> [#uses=0] - br i1 false, label %bb46, label %bb -bb: ; preds = %entry - %mrv.gep = getelementptr %struct.Demand* %mrv, i32 0, i32 0 ; [#uses=1] - %mrv.ld = load double* %mrv.gep ; [#uses=1] - %mrv.gep1 = getelementptr %struct.Demand* %mrv, i32 0, i32 1 ; [#uses=1] - %mrv.ld2 = load double* %mrv.gep1 ; [#uses=1] - ret double %mrv.ld, double %mrv.ld2 -bb46: ; preds = %entry - br label %bb72 -bb49: ; preds = %bb72 - call %struct.Demand @Compute_Leaf1( %struct.leaf* null, double 0.000000e+00, double 0.000000e+00 ) nounwind ; <%struct.Demand>:0 [#uses=1] - %gr = getresult %struct.Demand %0, 1 ; [#uses=0] - br label %bb72 -bb72: ; preds = %bb49, %bb46 - br i1 false, label %bb49, label %bb77 -bb77: ; preds = %bb72 - %mrv.gep3 = getelementptr %struct.Demand* %mrv, i32 0, i32 0 ; [#uses=1] - %mrv.ld4 = load double* %mrv.gep3 ; [#uses=1] - %mrv.gep5 = getelementptr %struct.Demand* %mrv, i32 0, i32 1 ; [#uses=1] - %mrv.ld6 = load double* %mrv.gep5 ; [#uses=1] - ret double %mrv.ld4, double %mrv.ld6 -} - -define %struct.Demand @Compute_Leaf1(%struct.leaf* %l, double %pi_R, double %pi_I) nounwind { -entry: - %mrv = alloca %struct.Demand ; <%struct.Demand> [#uses=2] - %tmp10 = load double @P, align 8 ; [#uses=1] - %tmp11 = fcmp olt double %tmp10, 0.000000e+00 ; [#uses=1] - br i1 %tmp11, label %bb, label %bb13 -bb: ; preds = %entry - br label %bb13 -bb13: ; preds = %bb, %entry - %mrv.gep = getelementptr %struct.Demand* %mrv, i32 0, i32 0 ; [#uses=1] - %mrv.ld = load double* %mrv.gep ; [#uses=1] - %mrv.gep1 = getelementptr %struct.Demand* %mrv, i32 0, i32 1 ; [#uses=1] - %mrv.ld2 = load double* %mrv.gep1 ; [#uses=1] - ret double %mrv.ld, double %mrv.ld2 -} Removed: llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline.ll?rev=54464&view=auto ============================================================================== --- llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline.ll (original) +++ llvm/trunk/test/Transforms/SRETPromotion/2008-03-07-Inline.ll (removed) @@ -1,57 +0,0 @@ -; RUN: llvm-as < %s \| opt -inline -disable-output - %struct.Demand = type { double, double } - %struct.branch = type { %struct.Demand, double, double, double, double, %struct.branch, [12 x %struct.leaf] } - %struct.leaf = type { %struct.Demand, double, double } - at P = external global double ; [#uses=1] - -define %struct.leaf* @build_leaf() nounwind { -entry: - unreachable -} - -define %struct.Demand @Compute_Branch2(%struct.branch* %br, double %theta_R, double %theta_I, double %pi_R, double %pi_I) nounwind { -entry: - %mrv = alloca %struct.Demand ; <%struct.Demand> [#uses=4] - %a2 = alloca %struct.Demand ; <%struct.Demand> [#uses=0] - br i1 false, label %bb46, label %bb -bb: ; preds = %entry - %mrv.gep = getelementptr %struct.Demand* %mrv, i32 0, i32 0 ; [#uses=1] - %mrv.ld = load double* %mrv.gep ; [#uses=1] - %mrv.gep1 = getelementptr %struct.Demand* %mrv, i32 0, i32 1 ; [#uses=1] - %mrv.ld2 = load double* %mrv.gep1 ; [#uses=1] - ret double %mrv.ld, double %mrv.ld2 -bb46: ; preds = %entry - br label %bb72 -bb49: ; preds = %bb72 - call %struct.Demand @Compute_Leaf1( %struct.leaf* null, double 0.000000e+00, double 0.000000e+00 ) nounwind ; <%struct.Demand>:0 [#uses=1] - %gr = getresult %struct.Demand %0, 1 ; [#uses=0] - br label %bb72 -bb72: ; preds = %bb49, %bb46 - br i1 false, label %bb49, label %bb77 -bb77: ; preds = %bb72 - %mrv.gep3 = getelementptr %struct.Demand* %mrv, i32 0, i32 0 ; [#uses=1] - %mrv.ld4 = load double* %mrv.gep3 ; [#uses=1] - %mrv.gep5 = getelementptr %struct.Demand* %mrv, i32 0, i32 1 ; [#uses=1] - %mrv.ld6 = load double* %mrv.gep5 ; [#uses=1] - ret double %mrv.ld4, double %mrv.ld6 -} - -define %struct.Demand @Compute_Leaf1(%struct.leaf* %l, double %pi_R, double %pi_I) nounwind { -entry: - %mrv = alloca %struct.Demand ; <%struct.Demand> [#uses=4] - %tmp10 = load double @P, align 8 ; [#uses=1] - %tmp11 = fcmp olt double %tmp10, 0.000000e+00 ; [#uses=1] - br i1 %tmp11, label %bb, label %bb13 -bb: ; preds = %entry - %mrv.gep = getelementptr %struct.Demand* %mrv, i32 0, i32 0 ; [#uses=1] - %mrv.ld = load double* %mrv.gep ; [#uses=1] - %mrv.gep1 = getelementptr %struct.Demand* %mrv, i32 0, i32 1 ; [#uses=1] - %mrv.ld2 = load double* %mrv.gep1 ; [#uses=1] - ret double %mrv.ld, double %mrv.ld2 -bb13: ; preds = %entry - %mrv.gep3 = getelementptr %struct.Demand* %mrv, i32 0, i32 0 ; [#uses=1] - %mrv.ld4 = load double* %mrv.gep3 ; [#uses=1] - %mrv.gep5 = getelementptr %struct.Demand* %mrv, i32 0, i32 1 ; [#uses=1] - %mrv.ld6 = load double* %mrv.gep5 ; [#uses=1] - ret double %mrv.ld4, double %mrv.ld6 -} From matthijs at stdin.nl Thu Aug 7 10:55:21 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Thu, 07 Aug 2008 15:55:21 -0000 Subject: [llvm-commits] [llvm] r54466 - /llvm/trunk/test/Transforms/SRETPromotion/basictest.ll Message-ID: <200808071555.m77FtLem006609@zion.cs.uiuc.edu> Author: matthijs Date: Thu Aug 7 10:55:18 2008 New Revision: 54466 URL: http://llvm.org/viewvc/llvm-project?rev=54466&view=rev Log: Add a basic test for the SRETPromotion pass. Added: llvm/trunk/test/Transforms/SRETPromotion/basictest.ll Added: llvm/trunk/test/Transforms/SRETPromotion/basictest.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/SRETPromotion/basictest.ll?rev=54466&view=auto ============================================================================== --- llvm/trunk/test/Transforms/SRETPromotion/basictest.ll (added) +++ llvm/trunk/test/Transforms/SRETPromotion/basictest.ll Thu Aug 7 10:55:18 2008 @@ -0,0 +1,33 @@ +; RUN: llvm-as < %s \| opt -sretpromotion \| llvm-dis > %t +; RUN: cat %t \| grep sret \| count 1 + +; This function is promotable +define internal void @promotable({i32, i32}* sret %s) { + %A = getelementptr {i32, i32}* %s, i32 0, i32 0 + store i32 0, i32* %A + %B = getelementptr {i32, i32}* %s, i32 0, i32 0 + store i32 1, i32* %B + ret void +} + +; This function is not promotable (due to it's use below) +define internal void @notpromotable({i32, i32}* sret %s) { + %A = getelementptr {i32, i32}* %s, i32 0, i32 0 + store i32 0, i32* %A + %B = getelementptr {i32, i32}* %s, i32 0, i32 0 + store i32 1, i32* %B + ret void +} + +define void @caller({i32, i32}* %t) { + %s = alloca {i32, i32} + call void @promotable({i32, i32}* %s) + %A = getelementptr {i32, i32}* %s, i32 0, i32 0 + %a = load i32* %A + %B = getelementptr {i32, i32}* %s, i32 0, i32 0 + %b = load i32* %B + ; This passes in something that's not an alloca, which makes the argument not + ; promotable + call void @notpromotable({i32, i32}* %t) + ret void +} From matthijs at stdin.nl Thu Aug 7 10:58:15 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Thu, 07 Aug 2008 15:58:15 -0000 Subject: [llvm-commits] [llvm] r54467 - /llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Message-ID: <200808071558.m77FwG2I006700@zion.cs.uiuc.edu> Author: matthijs Date: Thu Aug 7 10:58:09 2008 New Revision: 54467 URL: http://llvm.org/viewvc/llvm-project?rev=54467&view=rev Log: Fix SRETPromotion, it was generating functions without returns statements since r53941 (but this was not noticed due to the lack of a basic test for SRETPromotion). Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp?rev=54467&r1=54466&r2=54467&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Thu Aug 7 10:58:09 2008 @@ -121,7 +121,7 @@ ++BI; if (isa(I)) { Value NV = new LoadInst(TheAlloca, "mrv.ld", I); - ReturnInst NR = ReturnInst::Create(NV); + ReturnInst NR = ReturnInst::Create(NV, I); I->replaceAllUsesWith(NR); I->eraseFromParent(); } From matthijs at stdin.nl Thu Aug 7 11:01:31 2008 From: matthijs at stdin.nl (Matthijs Kooijman) Date: Thu, 07 Aug 2008 16:01:31 -0000 Subject: [llvm-commits] [llvm] r54468 - /llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Message-ID: <200808071601.m77G1WSI006816@zion.cs.uiuc.edu> Author: matthijs Date: Thu Aug 7 11:01:23 2008 New Revision: 54468 URL: http://llvm.org/viewvc/llvm-project?rev=54468&view=rev Log: Let SRETPromotion properly preserve the function name instead of (implicitly) postfixing it with a number. Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Modified: llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp?rev=54468&r1=54467&r2=54468&view=diff ============================================================================== --- llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp (original) +++ llvm/trunk/lib/Transforms/IPO/StructRetPromotion.cpp Thu Aug 7 11:01:23 2008 @@ -228,7 +228,8 @@ } FunctionType NFTy = FunctionType::get(STy, Params, FTy->isVarArg()); - Function NF = Function::Create(NFTy, F->getLinkage(), F->getName()); + Function NF = Function::Create(NFTy, F->getLinkage()); + NF->takeName(F); NF->copyAttributesFrom(F); NF->setParamAttrs(PAListPtr::get(ParamAttrsVec.begin(), ParamAttrsVec.end())); F->getParent()->getFunctionList().insert(F, NF); From baldrick at free.fr Thu Aug 7 12:48:12 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 07 Aug 2008 17:48:12 -0000 Subject: [llvm-commits] [llvm] r54471 - in /llvm/trunk/test: FrontendObjC++/ FrontendObjC++/2007-10-03-MetadataPointers.mm FrontendObjC++/dg.exp FrontendObjC/2007-10-03-MetadataPointers.mm FrontendObjC/dg.exp Message-ID: <200808071748.m77HmDgN010059@zion.cs.uiuc.edu> Author: baldrick Date: Thu Aug 7 12:48:08 2008 New Revision: 54471 URL: http://llvm.org/viewvc/llvm-project?rev=54471&view=rev Log: Move tests of the ObjC++ front-end to their own directory: some people (guess who!) may build llvm-gcc with support for objc but not with support for objc++. Added: llvm/trunk/test/FrontendObjC++/ llvm/trunk/test/FrontendObjC++/2007-10-03-MetadataPointers.mm (props changed) - copied unchanged from r54462, llvm/trunk/test/FrontendObjC/2007-10-03-MetadataPointers.mm llvm/trunk/test/FrontendObjC++/dg.exp Removed: llvm/trunk/test/FrontendObjC/2007-10-03-MetadataPointers.mm Modified: llvm/trunk/test/FrontendObjC/dg.exp Propchange: llvm/trunk/test/FrontendObjC++/2007-10-03-MetadataPointers.mm ------------------------------------------------------------------------------ svn:mergeinfo = Added: llvm/trunk/test/FrontendObjC++/dg.exp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendObjC%2B%2B/dg.exp?rev=54471&view=auto ============================================================================== --- llvm/trunk/test/FrontendObjC++/dg.exp (added) +++ llvm/trunk/test/FrontendObjC++/dg.exp Thu Aug 7 12:48:08 2008 @@ -0,0 +1,5 @@ +load_lib llvm.exp + +if [ llvm_gcc_supports objc++ ] then { + RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/.{mm}]] +} Removed: llvm/trunk/test/FrontendObjC/2007-10-03-MetadataPointers.mm URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendObjC/2007-10-03-MetadataPointers.mm?rev=54470&view=auto ============================================================================== --- llvm/trunk/test/FrontendObjC/2007-10-03-MetadataPointers.mm (original) +++ llvm/trunk/test/FrontendObjC/2007-10-03-MetadataPointers.mm (removed) @@ -1,7 +0,0 @@ -// RUN: %llvmgcc -w -x objective-c++ -c %s -o /dev/null - - at class NSImage; -void bork() { - NSImage nsimage; - [nsimage release]; -} Modified: llvm/trunk/test/FrontendObjC/dg.exp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendObjC/dg.exp?rev=54471&r1=54470&r2=54471&view=diff ============================================================================== --- llvm/trunk/test/FrontendObjC/dg.exp (original) +++ llvm/trunk/test/FrontendObjC/dg.exp Thu Aug 7 12:48:08 2008 @@ -2,6 +2,4 @@ if [ llvm_gcc_supports objc ] then { RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/.{m}]] - RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/.{mm}]] } - From baldrick at free.fr Thu Aug 7 13:00:00 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 07 Aug 2008 18:00:00 -0000 Subject: [llvm-commits] [llvm] r54474 - /llvm/trunk/test/lib/llvm.exp Message-ID: <200808071800.m77I01kp010412@zion.cs.uiuc.edu> Author: baldrick Date: Thu Aug 7 12:59:54 2008 New Revision: 54474 URL: http://llvm.org/viewvc/llvm-project?rev=54474&view=rev Log: Use correct compiler component names for objc and objc++. Modified: llvm/trunk/test/lib/llvm.exp Modified: llvm/trunk/test/lib/llvm.exp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/lib/llvm.exp?rev=54474&r1=54473&r2=54474&view=diff ============================================================================== --- llvm/trunk/test/lib/llvm.exp (original) +++ llvm/trunk/test/lib/llvm.exp Thu Aug 7 12:59:54 2008 @@ -236,8 +236,8 @@ ada { set file gnat1 } c { set file cc1 } c++ { set file cc1plus } - objc { set file cc1 } - objc++ { set file cc1 } + objc { set file cc1obj } + objc++ { set file cc1objplus } fortran { set file f951 } default { return 0 } } From kremenek at apple.com Thu Aug 7 13:10:53 2008 From: kremenek at apple.com (Ted Kremenek) Date: Thu, 07 Aug 2008 18:10:53 -0000 Subject: [llvm-commits] [llvm] r54475 - /llvm/tags/checker/checker-74/ Message-ID: <200808071810.m77IArc4010835@zion.cs.uiuc.edu> Author: kremenek Date: Thu Aug 7 13:10:50 2008 New Revision: 54475 URL: http://llvm.org/viewvc/llvm-project?rev=54475&view=rev Log: Tagging checker-74. Added: llvm/tags/checker/checker-74/ - copied from r54474, llvm/trunk/ From isanbard at gmail.com Thu Aug 7 13:14:26 2008 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 07 Aug 2008 18:14:26 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54479 - in /llvm-gcc-4.2/trunk/gcc: gsyslimits.h limitx.h limity.h Message-ID: <200808071814.m77IEQiS010978@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 13:14:25 2008 New Revision: 54479 URL: http://llvm.org/viewvc/llvm-project?rev=54479&view=rev Log: Revert r54245. Matthijs did a check and verified that this ugly hack isn't needed anymore. Modified: llvm-gcc-4.2/trunk/gcc/gsyslimits.h llvm-gcc-4.2/trunk/gcc/limitx.h llvm-gcc-4.2/trunk/gcc/limity.h Modified: llvm-gcc-4.2/trunk/gcc/gsyslimits.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/gsyslimits.h?rev=54479&r1=54478&r2=54479&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/gsyslimits.h (original) +++ llvm-gcc-4.2/trunk/gcc/gsyslimits.h Thu Aug 7 13:14:25 2008 @@ -5,10 +5,4 @@ #define _GCC_NEXT_LIMITS_H /* tell gcc's limits.h to recurse / / APPLE LOCAL begin 4401222 / -/ LLVM LOCAL / -#ifndef CONFIG_DARWIN_H -#include_next -#undef _GCC_NEXT_LIMITS_H -/ LLVM LOCAL / -#endif / not CONFIG_DARWIN_H / / APPLE LOCAL end 4401222 / Modified: llvm-gcc-4.2/trunk/gcc/limitx.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/limitx.h?rev=54479&r1=54478&r2=54479&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/limitx.h (original) +++ llvm-gcc-4.2/trunk/gcc/limitx.h Thu Aug 7 13:14:25 2008 @@ -2,27 +2,6 @@ if the system has its own version of limits.h. / /* APPLE LOCAL begin 4401222 / -/ LLVM LOCAL / -#ifdef CONFIG_DARWIN_H - -#ifndef _LIBC_LIMITS_H_ -/ Use "..." so that we find syslimits.h only in this same directory. / -#include "syslimits.h" -#endif -#ifdef _GCC_NEXT_LIMITS_H -#include_next -#undef _GCC_NEXT_LIMITS_H -#endif - -/ LLVM LOCAL begin / -#endif / not CONFIG_DARWIN_H / - -/ We use _GCC_LIMITS_H_ because we want this not to match - any macros that the system's limits.h uses for its own purposes. / -/ LLVM LOCAL / -#if !defined(_GCC_LIMITS_H_) && !defined(CONFIG_DARWIN_H) / Terminated in limity.h. / -#define _GCC_LIMITS_H_ - #ifndef _LIBC_LIMITS_H_ / Use "..." so that we find syslimits.h only in this same directory. / #include "syslimits.h" @@ -31,5 +10,4 @@ #include_next #undef _GCC_NEXT_LIMITS_H #endif -/ LLVM LOCAL end / / APPLE LOCAL end 4401222 / Modified: llvm-gcc-4.2/trunk/gcc/limity.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/limity.h?rev=54479&r1=54478&r2=54479&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/limity.h (original) +++ llvm-gcc-4.2/trunk/gcc/limity.h Thu Aug 7 13:14:25 2008 @@ -1,19 +1,2 @@ / APPLE LOCAL begin 4401222 / - -/ This administrivia gets added to the end of limits.h - if the system has its own version of limits.h. / - -#else / not _GCC_LIMITS_H_ / - -/ LLVM LOCAL / -#ifndef CONFIG_DARWIN_H - -#ifdef _GCC_NEXT_LIMITS_H -#include_next / recurse down to the real one / -#endif - -/ LLVM LOCAL / -#endif / not CONFIG_DARWIN_H / - -#endif / not _GCC_LIMITS_H_ / / APPLE LOCAL end 4401222 / From isanbard at gmail.com Thu Aug 7 13:22:16 2008 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 07 Aug 2008 18:22:16 -0000 Subject: [llvm-commits] [llvm] r54480 - /llvm/tags/Apple/llvmCore-2062/ Message-ID: <200808071822.m77IMHpK011206@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 13:22:11 2008 New Revision: 54480 URL: http://llvm.org/viewvc/llvm-project?rev=54480&view=rev Log: Creating llvmCore-2062 based off of llvmCore-2061. Added: llvm/tags/Apple/llvmCore-2062/ - copied from r54479, llvm/tags/Apple/llvmCore-2061/ From isanbard at gmail.com Thu Aug 7 13:23:02 2008 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 07 Aug 2008 18:23:02 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54481 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2062/ Message-ID: <200808071823.m77IN3Wt011236@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 13:23:02 2008 New Revision: 54481 URL: http://llvm.org/viewvc/llvm-project?rev=54481&view=rev Log: Creating llvmgcc42-2062 based off of llvmgcc42-2061. Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2062/ - copied from r54480, llvm-gcc-4.2/tags/Apple/llvmgcc42-2061/ From isanbard at gmail.com Thu Aug 7 13:26:57 2008 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 07 Aug 2008 18:26:57 -0000 Subject: [llvm-commits] [llvm] r54482 - in /llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine: ExecutionEngine.cpp JIT/JIT.cpp JIT/JITEmitter.cpp JIT/JITMemoryManager.cpp Message-ID: <200808071826.m77IQvsU011387@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 13:26:57 2008 New Revision: 54482 URL: http://llvm.org/viewvc/llvm-project?rev=54482&view=rev Log: Pull r54442 into llvmCore-2062: Rewrite JIT handling of GlobalVariables so they are allocated in the same buffer as the code, jump tables, etc. The default JIT memory manager does not handle buffer overflow well. I didn't introduce this and I'm not attempting to fix it here, but it is more likely to be hit now since we're putting more stuff in the buffer. This affects one test that I know of so far, MultiSource/Benchmarks/NPB-serial/is. Modified: llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/ExecutionEngine.cpp llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JIT.cpp llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITEmitter.cpp llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITMemoryManager.cpp Modified: llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/ExecutionEngine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/ExecutionEngine.cpp?rev=54482&r1=54481&r2=54482&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/ExecutionEngine.cpp (original) +++ llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/ExecutionEngine.cpp Thu Aug 7 13:26:57 2008 @@ -819,6 +819,8 @@ // specified memory location... // void ExecutionEngine::InitializeMemory(const Constant Init, void Addr) { + DOUT << "Initializing " << Addr; + DEBUG(Init->dump()); if (isa(Init)) { return; } else if (const ConstantVector CP = dyn_cast(Init)) { Modified: llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JIT.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JIT.cpp?rev=54482&r1=54481&r2=54482&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JIT.cpp (original) +++ llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JIT.cpp Thu Aug 7 13:26:57 2008 @@ -415,30 +415,22 @@ cerr << "Could not resolve external global address: " << GV->getName() << "\n"; abort(); + addGlobalMapping(GV, Ptr); } } else { - // If the global hasn't been emitted to memory yet, allocate space. We will - // actually initialize the global after current function has finished - // compilation. + // If the global hasn't been emitted to memory yet, allocate space and + // emit it into memory. It goes in the same array as the generated + // code, jump tables, etc. const Type GlobalType = GV->getType()->getElementType(); size_t S = getTargetData()->getABITypeSize(GlobalType); size_t A = getTargetData()->getPreferredAlignment(GV); - if (A <= 8) { - Ptr = malloc(S); - } else { - // Allocate S+A bytes of memory, then use an aligned pointer within that - // space. - Ptr = malloc(S+A); - unsigned MisAligned = ((intptr_t)Ptr & (A-1)); - Ptr = (char)Ptr + (MisAligned ? (A-MisAligned) : 0); - } - jitstate->getPendingGlobals(locked).push_back(GV); + Ptr = MCE->allocateSpace(S, A); + addGlobalMapping(GV, Ptr); + EmitGlobalVariable(GV); } - addGlobalMapping(GV, Ptr); return Ptr; } - /// recompileAndRelinkFunction - This method is used to force a function /// which has already been compiled, to be compiled again, possibly /// after it has been modified. Then the entry to the old copy is overwritten Modified: llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITEmitter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITEmitter.cpp?rev=54482&r1=54481&r2=54482&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITEmitter.cpp (original) +++ llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITEmitter.cpp Thu Aug 7 13:26:57 2008 @@ -15,9 +15,9 @@ #define DEBUG_TYPE "jit" #include "JIT.h" #include "JITDwarfEmitter.h" -#include "llvm/Constant.h" +#include "llvm/Constants.h" #include "llvm/Module.h" -#include "llvm/Type.h" +#include "llvm/DerivedTypes.h" #include "llvm/CodeGen/MachineCodeEmitter.h" #include "llvm/CodeGen/MachineFunction.h" #include "llvm/CodeGen/MachineConstantPool.h" @@ -25,6 +25,7 @@ #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/MachineRelocation.h" #include "llvm/ExecutionEngine/JITMemoryManager.h" +#include "llvm/ExecutionEngine/GenericValue.h" #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetJITInfo.h" #include "llvm/Target/TargetMachine.h" @@ -36,6 +37,7 @@ #include "llvm/Target/TargetInstrInfo.h" #include "llvm/ADT/Statistic.h" #include +#include using namespace llvm; STATISTIC(NumBytes, "Number of bytes of machine code compiled"); @@ -467,6 +469,9 @@ /// MMI - Machine module info for exception informations MachineModuleInfo* MMI; + // GVSet - a set to keep track of which globals have been seen + std::set GVSet; + public: JITEmitter(JIT &jit, JITMemoryManager JMM) : Resolver(jit) { MemMgr = JMM ? JMM : JITMemoryManager::CreateDefaultMemManager(); @@ -541,6 +546,10 @@ void getPointerToGlobal(GlobalValue GV, void Reference, bool NoNeedStub); void getPointerToGVLazyPtr(GlobalValue V, void Reference, bool NoNeedStub); + unsigned addSizeOfGlobal(const GlobalVariable GV, unsigned Size); + unsigned addSizeOfGlobalsInConstantVal(const Constant C, unsigned Size); + unsigned addSizeOfGlobalsInInitializer(const Constant Init, unsigned Size); + unsigned GetSizeOfGlobalsInBytes(MachineFunction &MF); }; } @@ -618,9 +627,154 @@ return Size + Alignment; } +/// addSizeOfGlobal - add the size of the global (plus any alignment padding) +/// into the running total Size. + +unsigned JITEmitter::addSizeOfGlobal(const GlobalVariable GV, unsigned Size) { + const Type ElTy = GV->getType()->getElementType(); + size_t GVSize = (size_t)TheJIT->getTargetData()->getABITypeSize(ElTy); + size_t GVAlign = + (size_t)TheJIT->getTargetData()->getPreferredAlignment(GV); + DOUT << "Adding in size " << GVSize << " alignment " << GVAlign; + DEBUG(GV->dump()); + // Assume code section ends with worst possible alignment, so first + // variable needs maximal padding. + if (Size==0) + Size = 1; + Size = ((Size+GVAlign-1)/GVAlign)GVAlign; + Size += GVSize; + return Size; +} + +/// addSizeOfGlobalsInConstantVal - find any globals that we haven't seen yet +/// but are referenced from the constant; put them in GVSet and add their +/// size into the running total Size. + +unsigned JITEmitter::addSizeOfGlobalsInConstantVal(const Constant C, + unsigned Size) { + // If its undefined, return the garbage. + if (isa(C)) + return Size; + + // If the value is a ConstantExpr + if (const ConstantExpr CE = dyn_cast(C)) { + Constant Op0 = CE->getOperand(0); + switch (CE->getOpcode()) { + case Instruction::GetElementPtr: + case Instruction::Trunc: + case Instruction::ZExt: + case Instruction::SExt: + case Instruction::FPTrunc: + case Instruction::FPExt: + case Instruction::UIToFP: + case Instruction::SIToFP: + case Instruction::FPToUI: + case Instruction::FPToSI: + case Instruction::PtrToInt: + case Instruction::IntToPtr: + case Instruction::BitCast: { + Size = addSizeOfGlobalsInConstantVal(Op0, Size); + break; + } + case Instruction::Add: + case Instruction::Sub: + case Instruction::Mul: + case Instruction::UDiv: + case Instruction::SDiv: + case Instruction::URem: + case Instruction::SRem: + case Instruction::And: + case Instruction::Or: + case Instruction::Xor: { + Size = addSizeOfGlobalsInConstantVal(Op0, Size); + Size = addSizeOfGlobalsInConstantVal(CE->getOperand(1), Size); + break; + } + default: { + cerr << "ConstantExpr not handled: " << CE << "\n"; + abort(); + } + } + } + + if (C->getType()->getTypeID() == Type::PointerTyID) + if (const GlobalVariable GV = dyn_cast(C)) + if (GVSet.insert(GV).second) + Size = addSizeOfGlobal(GV, Size); + + return Size; +} + +/// addSizeOfGLobalsInInitializer - handle any globals that we haven't seen yet +/// but are referenced from the given initializer. + +unsigned JITEmitter::addSizeOfGlobalsInInitializer(const Constant Init, + unsigned Size) { + if (!isa(Init) && + !isa(Init) && + !isa(Init) && + !isa(Init) && + !isa(Init) && + Init->getType()->isFirstClassType()) + Size = addSizeOfGlobalsInConstantVal(Init, Size); + return Size; +} + +/// GetSizeOfGlobalsInBytes - walk the code for the function, looking for +/// globals; then walk the initializers of those globals looking for more. +/// If their size has not been considered yet, add it into the running total +/// Size. + +unsigned JITEmitter::GetSizeOfGlobalsInBytes(MachineFunction &MF) { + unsigned Size = 0; + GVSet.clear(); + + for (MachineFunction::iterator MBB = MF.begin(), E = MF.end(); + MBB != E; ++MBB) { + for (MachineBasicBlock::const_iterator I = MBB->begin(), E = MBB->end(); + I != E; ++I) { + const TargetInstrDesc &Desc = I->getDesc(); + const MachineInstr &MI = I; + unsigned NumOps = Desc.getNumOperands(); + for (unsigned CurOp = 0; CurOp < NumOps; CurOp++) { + const MachineOperand &MO = MI.getOperand(CurOp); + if (MO.isGlobalAddress()) { + GlobalValue* V = MO.getGlobal(); + const GlobalVariable GV = dyn_cast(V); + if (!GV) + continue; + // If seen in previous function, it will have an entry here. + if (TheJIT->getPointerToGlobalIfAvailable(GV)) + continue; + // If seen earlier in this function, it will have an entry here. + // FIXME: it should be possible to combine these tables, by + // assuming the addresses of the new globals in this module + // start at 0 (or something) and adjusting them after codegen + // complete. Another possibility is to grab a marker bit in GV. + if (GVSet.insert(GV).second) + // A variable as yet unseen. Add in its size. + Size = addSizeOfGlobal(GV, Size); + } + } + } + } + DOUT << "About to look through initializers\n"; + // Look for more globals that are referenced only from initializers. + // GVSet.end is computed each time because the set can grow as we go. + for (std::set::iterator I = GVSet.begin(); + I != GVSet.end(); I++) { + const GlobalVariable GV = I; + if (GV->hasInitializer()) + Size = addSizeOfGlobalsInInitializer(GV->getInitializer(), Size); + } + + return Size; +} + void JITEmitter::startFunction(MachineFunction &F) { uintptr_t ActualSize = 0; if (MemMgr->NeedsExactSize()) { + DOUT << "ExactSize\n"; const TargetInstrInfo TII = F.getTarget().getInstrInfo(); MachineJumpTableInfo MJTI = F.getJumpTableInfo(); MachineConstantPool MCP = F.getConstantPool(); @@ -647,6 +801,13 @@ // Add the function size ActualSize += TII->GetFunctionSizeInBytes(F); + + DOUT << "ActualSize before globals " << ActualSize << "\n"; + // Add the size of the globals that will be allocated after this function. + // These are all the ones referenced from this function that were not + // previously allocated. + ActualSize += GetSizeOfGlobalsInBytes(F); + DOUT << "ActualSize after globals " << ActualSize << "\n"; } BufferBegin = CurBufferPtr = MemMgr->startFunctionBody(F.getFunction(), @@ -679,10 +840,6 @@ // other per-function data. unsigned char FnStart = (unsigned char )TheJIT->getPointerToGlobalIfAvailable(F.getFunction()); - unsigned char FnEnd = CurBufferPtr; - - MemMgr->endFunctionBody(F.getFunction(), BufferBegin, FnEnd); - NumBytes += FnEnd-FnStart; if (!Relocations.empty()) { NumRelos += Relocations.size(); @@ -734,6 +891,11 @@ Relocations.size(), MemMgr->getGOTBase()); } + unsigned char FnEnd = CurBufferPtr; + + MemMgr->endFunctionBody(F.getFunction(), BufferBegin, FnEnd); + NumBytes += FnEnd-FnStart; + // Update the GOT entry for F to point to the new code. if (MemMgr->isManagingGOT()) { unsigned idx = Resolver.getGOTIndexForAddr((void)BufferBegin); @@ -962,7 +1124,7 @@ /// freeMachineCodeForFunction - release machine code memory for given Function. /// void JIT::freeMachineCodeForFunction(Function F) { - + // Delete translation for this from the ExecutionEngine, so it will get // retranslated next time it is used. void OldPtr = updateGlobalMapping(F, 0); Modified: llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITMemoryManager.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITMemoryManager.cpp?rev=54482&r1=54481&r2=54482&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITMemoryManager.cpp (original) +++ llvm/tags/Apple/llvmCore-2062/lib/ExecutionEngine/JIT/JITMemoryManager.cpp Thu Aug 7 13:26:57 2008 @@ -287,7 +287,7 @@ assert(FunctionEnd > FunctionStart); assert(FunctionStart == (unsigned char )(CurBlock+1) && "Mismatched function start/end!"); - + uintptr_t BlockSize = FunctionEnd - (unsigned char )CurBlock; FunctionBlocks[F] = CurBlock; From resistor at mac.com Thu Aug 7 13:28:08 2008 From: resistor at mac.com (Owen Anderson) Date: Thu, 07 Aug 2008 18:28:08 -0000 Subject: [llvm-commits] [llvm] r54483 - /llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Message-ID: <200808071828.m77IS8rj011426@zion.cs.uiuc.edu> Author: resistor Date: Thu Aug 7 13:28:07 2008 New Revision: 54483 URL: http://llvm.org/viewvc/llvm-project?rev=54483&view=rev Log: Do a dominator walk when scheduling copies, rather than a DFS on the CFG. Also, fix a few problems when creating live intervals for temporaries created by phi elimination. Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Modified: llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp?rev=54483&r1=54482&r2=54483&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp (original) +++ llvm/trunk/lib/CodeGen/StrongPHIElimination.cpp Thu Aug 7 13:28:07 2008 @@ -139,7 +139,7 @@ std::vector& DF, std::vector >& locals); void ScheduleCopies(MachineBasicBlock MBB, std::set& pushed); - void InsertCopies(MachineBasicBlock* MBB, + void InsertCopies(MachineDomTreeNode* MBB, SmallPtrSet& v); void mergeLiveIntervals(unsigned primary, unsigned secondary, MachineBasicBlock* pred); @@ -303,10 +303,9 @@ static bool isLiveOut(unsigned r, MachineBasicBlock* MBB, LiveIntervals& LI) { for (MachineBasicBlock::succ_iterator PI = MBB->succ_begin(), - E = MBB->succ_end(); PI != E; ++PI) { + E = MBB->succ_end(); PI != E; ++PI) if (isLiveIn(r, PI, LI)) return true; - } return false; } @@ -691,6 +690,9 @@ // Insert curr.second in pushed pushed.insert(curr.second); + + // Create a live interval for this temporary + InsertedPHIDests.push_back(std::make_pair(t, --PI)); } // Insert copy from map[curr.first] to curr.second @@ -748,34 +750,63 @@ std::set RegHandled; for (SmallVector, 4>::iterator I = InsertedPHIDests.begin(), E = InsertedPHIDests.end(); I != E; ++I) - if (RegHandled.insert(I->first).second) + if (RegHandled.insert(I->first).second && + !LI.getOrCreateInterval(I->first).liveAt( + LI.getMBBEndIdx(I->second->getParent()))) LI.addLiveRangeToEndOfBlock(I->first, I->second); } /// InsertCopies - insert copies into MBB and all of its successors -void StrongPHIElimination::InsertCopies(MachineBasicBlock MBB, +void StrongPHIElimination::InsertCopies(MachineDomTreeNode* MDTN, SmallPtrSet& visited) { + MachineBasicBlock* MBB = MDTN->getBlock(); visited.insert(MBB); std::set pushed; + LiveIntervals& LI = getAnalysis(); // Rewrite register uses from Stacks for (MachineBasicBlock::iterator I = MBB->begin(), E = MBB->end(); - I != E; ++I) + I != E; ++I) { + if (I->getOpcode() == TargetInstrInfo::PHI) + continue; + for (unsigned i = 0; i < I->getNumOperands(); ++i) if (I->getOperand(i).isRegister() && Stacks[I->getOperand(i).getReg()].size()) { + // Remove the live range for the old vreg. + LiveInterval& OldInt = LI.getInterval(I->getOperand(i).getReg()); + LiveInterval::iterator OldLR = OldInt.FindLiveRangeContaining( + LiveIntervals::getUseIndex(LI.getInstructionIndex(I))); + if (OldLR != OldInt.end()) + OldInt.removeRange(OldLR, true); + + // Change the register I->getOperand(i).setReg(Stacks[I->getOperand(i).getReg()].back()); + + // Add a live range for the new vreg + LiveInterval& Int = LI.getInterval(I->getOperand(i).getReg()); + VNInfo FirstVN = Int.vni_begin(); + FirstVN->hasPHIKill = false; + if (I->getOperand(i).isKill()) + FirstVN->kills.push_back( + LiveIntervals::getUseIndex(LI.getInstructionIndex(I))); + + LiveRange LR (LI.getMBBStartIdx(I->getParent()), + LiveIntervals::getUseIndex(LI.getInstructionIndex(I)), + FirstVN); + + Int.addRange(LR); } + } // Schedule the copies for this block ScheduleCopies(MBB, pushed); - // Recur to our successors - for (GraphTraits::ChildIteratorType I = - GraphTraits::child_begin(MBB), E = - GraphTraits::child_end(MBB); I != E; ++I) - if (!visited.count(I)) + // Recur down the dominator tree. + for (MachineDomTreeNode::iterator I = MDTN->begin(), + E = MDTN->end(); I != E; ++I) + if (!visited.count((I)->getBlock())) InsertCopies(I, visited); // As we exit this block, pop the names we pushed while processing it @@ -884,7 +915,8 @@ // Insert copies // FIXME: This process should probably preserve LiveIntervals SmallPtrSet visited; - InsertCopies(Fn.begin(), visited); + MachineDominatorTree& MDT = getAnalysis(); + InsertCopies(MDT.getRootNode(), visited); // Perform renaming for (RenameSetType::iterator I = RenameSets.begin(), E = RenameSets.end(); @@ -901,8 +933,6 @@ RenameSets[SI->first].end()); RenameSets.erase(SI->first); } - - } I->second.erase(SI->first); From bruno.cardoso at gmail.com Thu Aug 7 14:01:24 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Thu, 07 Aug 2008 19:01:24 -0000 Subject: [llvm-commits] [llvm] r54484 - in /llvm/trunk: include/llvm/CodeGen/RuntimeLibcalls.h lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp lib/CodeGen/SelectionDAG/LegalizeTypes.h lib/CodeGen/SelectionDAG/TargetLowering.cpp Message-ID: <200808071901.m77J1P1f012409@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 14:01:24 2008 New Revision: 54484 URL: http://llvm.org/viewvc/llvm-project?rev=54484&view=rev Log: Add the remaining fp_round libcalls: FPROUND_F80_F32, FPROUND_PPCF128_F32, FPROUND_F80_F64, FPROUND_PPCF128_F64 Support for soften float fp_round operands is added, Mips needs this to round f64->f32. Also added support to soften float FABS result, Mips doesn't support double fabs results while in 'single float only' mode. Modified: llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Modified: llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h?rev=54484&r1=54483&r2=54484&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h (original) +++ llvm/trunk/include/llvm/CodeGen/RuntimeLibcalls.h Thu Aug 7 14:01:24 2008 @@ -101,6 +101,10 @@ // CONVERSION FPEXT_F32_F64, FPROUND_F64_F32, + FPROUND_F80_F32, + FPROUND_PPCF128_F32, + FPROUND_F80_F64, + FPROUND_PPCF128_F64, FPTOSINT_F32_I32, FPTOSINT_F32_I64, FPTOSINT_F32_I128, Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp?rev=54484&r1=54483&r2=54484&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeFloatTypes.cpp Thu Aug 7 14:01:24 2008 @@ -59,6 +59,7 @@ case ISD::ConstantFP: R = SoftenFloatRes_ConstantFP(cast(N)); break; + case ISD::FABS: R = SoftenFloatRes_FABS(N); break; case ISD::FADD: R = SoftenFloatRes_FADD(N); break; case ISD::FCOPYSIGN: R = SoftenFloatRes_FCOPYSIGN(N); break; case ISD::FDIV: R = SoftenFloatRes_FDIV(N); break; @@ -96,6 +97,17 @@ TLI.getTypeToTransformTo(N->getValueType(0))); } +SDValue DAGTypeLegalizer::SoftenFloatRes_FABS(SDNode N) { + MVT NVT = TLI.getTypeToTransformTo(N->getValueType(0)); + unsigned Size = NVT.getSizeInBits(); + + // Mask = ~(1 << (Size-1)) + SDValue Mask = DAG.getConstant(APInt::getAllOnesValue(Size).clear(Size-1), + NVT); + SDValue Op = GetSoftenedFloat(N->getOperand(0)); + return DAG.getNode(ISD::AND, NVT, Op, Mask); +} + SDValue DAGTypeLegalizer::SoftenFloatRes_FADD(SDNode N) { MVT NVT = TLI.getTypeToTransformTo(N->getValueType(0)); SDValue Ops[2] = { GetSoftenedFloat(N->getOperand(0)), @@ -290,6 +302,7 @@ case ISD::BIT_CONVERT: Res = SoftenFloatOp_BIT_CONVERT(N); break; case ISD::BR_CC: Res = SoftenFloatOp_BR_CC(N); break; + case ISD::FP_ROUND: Res = SoftenFloatOp_FP_ROUND(N); break; case ISD::FP_TO_SINT: Res = SoftenFloatOp_FP_TO_SINT(N); break; case ISD::FP_TO_UINT: Res = SoftenFloatOp_FP_TO_UINT(N); break; case ISD::SELECT_CC: Res = SoftenFloatOp_SELECT_CC(N); break; @@ -407,6 +420,17 @@ GetSoftenedFloat(N->getOperand(0))); } +SDValue DAGTypeLegalizer::SoftenFloatOp_FP_ROUND(SDNode N) { + MVT SVT = N->getOperand(0).getValueType(); + MVT RVT = N->getValueType(0); + + RTLIB::Libcall LC = RTLIB::getFPROUND(SVT, RVT); + assert(LC != RTLIB::UNKNOWN_LIBCALL && "Unsupported FP_ROUND libcall"); + + SDValue Op = GetSoftenedFloat(N->getOperand(0)); + return MakeLibCall(LC, RVT, &Op, 1, false); +} + SDValue DAGTypeLegalizer::SoftenFloatOp_BR_CC(SDNode N) { SDValue NewLHS = N->getOperand(2), NewRHS = N->getOperand(3); ISD::CondCode CCCode = cast(N->getOperand(1))->get(); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h?rev=54484&r1=54483&r2=54484&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/LegalizeTypes.h Thu Aug 7 14:01:24 2008 @@ -334,6 +334,7 @@ SDValue SoftenFloatRes_BIT_CONVERT(SDNode N); SDValue SoftenFloatRes_BUILD_PAIR(SDNode N); SDValue SoftenFloatRes_ConstantFP(ConstantFPSDNode N); + SDValue SoftenFloatRes_FABS(SDNode N); SDValue SoftenFloatRes_FADD(SDNode N); SDValue SoftenFloatRes_FCOPYSIGN(SDNode N); SDValue SoftenFloatRes_FDIV(SDNode N); @@ -352,6 +353,7 @@ bool SoftenFloatOperand(SDNode N, unsigned OpNo); SDValue SoftenFloatOp_BIT_CONVERT(SDNode N); SDValue SoftenFloatOp_BR_CC(SDNode N); + SDValue SoftenFloatOp_FP_ROUND(SDNode N); SDValue SoftenFloatOp_FP_TO_SINT(SDNode N); SDValue SoftenFloatOp_FP_TO_UINT(SDNode N); SDValue SoftenFloatOp_SELECT_CC(SDNode N); Modified: llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp?rev=54484&r1=54483&r2=54484&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/TargetLowering.cpp Thu Aug 7 14:01:24 2008 @@ -97,6 +97,10 @@ Names[RTLIB::POW_PPCF128] = "powl"; Names[RTLIB::FPEXT_F32_F64] = "__extendsfdf2"; Names[RTLIB::FPROUND_F64_F32] = "__truncdfsf2"; + Names[RTLIB::FPROUND_F80_F32] = "__truncxfsf2"; + Names[RTLIB::FPROUND_PPCF128_F32] = "__trunctfsf2"; + Names[RTLIB::FPROUND_F80_F64] = "__truncxfdf2"; + Names[RTLIB::FPROUND_PPCF128_F64] = "__trunctfdf2"; Names[RTLIB::FPTOSINT_F32_I32] = "__fixsfsi"; Names[RTLIB::FPTOSINT_F32_I64] = "__fixsfdi"; Names[RTLIB::FPTOSINT_F32_I128] = "__fixsfti"; @@ -176,9 +180,18 @@ /// getFPROUND - Return the FPROUND__ value for the given types, or /// UNKNOWN_LIBCALL if there is none. RTLIB::Libcall RTLIB::getFPROUND(MVT OpVT, MVT RetVT) { - if (OpVT == MVT::f64) { - if (RetVT == MVT::f32) + if (RetVT == MVT::f32) { + if (OpVT == MVT::f64) return FPROUND_F64_F32; + if (OpVT == MVT::f80) + return FPROUND_F80_F32; + if (OpVT == MVT::ppcf128) + return FPROUND_PPCF128_F32; + } else if (RetVT == MVT::f64) { + if (OpVT == MVT::f80) + return FPROUND_F80_F64; + if (OpVT == MVT::ppcf128) + return FPROUND_PPCF128_F64; } return UNKNOWN_LIBCALL; } From bruno.cardoso at gmail.com Thu Aug 7 14:08:11 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Thu, 07 Aug 2008 19:08:11 -0000 Subject: [llvm-commits] [llvm] r54485 - in /llvm/trunk/lib/Target/Mips: MipsISelLowering.cpp MipsISelLowering.h MipsRegisterInfo.cpp Message-ID: <200808071908.m77J8BgM012613@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 14:08:11 2008 New Revision: 54485 URL: http://llvm.org/viewvc/llvm-project?rev=54485&view=rev Log: Added Mips support for DYNAMIC_STACKALLOC Fixed bug in adjustMipsStackFrame, which was breaking while trying to access a dead stack object index. Also added one more alignment before fixing the callee saved registers stack offset adjustment. Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp llvm/trunk/lib/Target/Mips/MipsISelLowering.h llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=54485&r1=54484&r2=54485&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Thu Aug 7 14:08:11 2008 @@ -92,16 +92,17 @@ AddPromotedToType(ISD::SETCC, MVT::i1, MVT::i32); // Mips Custom Operations - setOperationAction(ISD::GlobalAddress, MVT::i32, Custom); - setOperationAction(ISD::GlobalTLSAddress, MVT::i32, Custom); - setOperationAction(ISD::RET, MVT::Other, Custom); - setOperationAction(ISD::JumpTable, MVT::i32, Custom); - setOperationAction(ISD::ConstantPool, MVT::i32, Custom); - setOperationAction(ISD::SELECT, MVT::f32, Custom); - setOperationAction(ISD::SELECT, MVT::i32, Custom); - setOperationAction(ISD::SELECT_CC, MVT::i32, Custom); - setOperationAction(ISD::SETCC, MVT::f32, Custom); - setOperationAction(ISD::BRCOND, MVT::Other, Custom); + setOperationAction(ISD::GlobalAddress, MVT::i32, Custom); + setOperationAction(ISD::GlobalTLSAddress, MVT::i32, Custom); + setOperationAction(ISD::RET, MVT::Other, Custom); + setOperationAction(ISD::JumpTable, MVT::i32, Custom); + setOperationAction(ISD::ConstantPool, MVT::i32, Custom); + setOperationAction(ISD::SELECT, MVT::f32, Custom); + setOperationAction(ISD::SELECT, MVT::i32, Custom); + setOperationAction(ISD::SELECT_CC, MVT::i32, Custom); + setOperationAction(ISD::SETCC, MVT::f32, Custom); + setOperationAction(ISD::BRCOND, MVT::Other, Custom); + setOperationAction(ISD::DYNAMIC_STACKALLOC, MVT::i32, Custom); // We custom lower AND/OR to handle the case where the DAG contain 'ands/ors' // with operands comming from setcc fp comparions. This is necessary since @@ -161,19 +162,20 @@ { switch (Op.getOpcode()) { - case ISD::AND: return LowerANDOR(Op, DAG); - case ISD::BRCOND: return LowerBRCOND(Op, DAG); - case ISD::CALL: return LowerCALL(Op, DAG); - case ISD::ConstantPool: return LowerConstantPool(Op, DAG); - case ISD::FORMAL_ARGUMENTS: return LowerFORMAL_ARGUMENTS(Op, DAG); - case ISD::GlobalAddress: return LowerGlobalAddress(Op, DAG); - case ISD::GlobalTLSAddress: return LowerGlobalTLSAddress(Op, DAG); - case ISD::JumpTable: return LowerJumpTable(Op, DAG); - case ISD::OR: return LowerANDOR(Op, DAG); - case ISD::RET: return LowerRET(Op, DAG); - case ISD::SELECT: return LowerSELECT(Op, DAG); - case ISD::SELECT_CC: return LowerSELECT_CC(Op, DAG); - case ISD::SETCC: return LowerSETCC(Op, DAG); + case ISD::AND: return LowerANDOR(Op, DAG); + case ISD::BRCOND: return LowerBRCOND(Op, DAG); + case ISD::CALL: return LowerCALL(Op, DAG); + case ISD::ConstantPool: return LowerConstantPool(Op, DAG); + case ISD::DYNAMIC_STACKALLOC: return LowerDYNAMIC_STACKALLOC(Op, DAG); + case ISD::FORMAL_ARGUMENTS: return LowerFORMAL_ARGUMENTS(Op, DAG); + case ISD::GlobalAddress: return LowerGlobalAddress(Op, DAG); + case ISD::GlobalTLSAddress: return LowerGlobalTLSAddress(Op, DAG); + case ISD::JumpTable: return LowerJumpTable(Op, DAG); + case ISD::OR: return LowerANDOR(Op, DAG); + case ISD::RET: return LowerRET(Op, DAG); + case ISD::SELECT: return LowerSELECT(Op, DAG); + case ISD::SELECT_CC: return LowerSELECT_CC(Op, DAG); + case ISD::SETCC: return LowerSETCC(Op, DAG); } return SDValue(); } @@ -362,6 +364,29 @@ //===----------------------------------------------------------------------===// SDValue MipsTargetLowering:: +LowerDYNAMIC_STACKALLOC(SDValue Op, SelectionDAG &DAG) +{ + SDValue Chain = Op.getOperand(0); + SDValue Size = Op.getOperand(1); + + // Get a reference from Mips stack pointer + SDValue StackPointer = DAG.getCopyFromReg(Chain, Mips::SP, MVT::i32); + + // Subtract the dynamic size from the actual stack size to + // obtain the new stack size. + SDValue Sub = DAG.getNode(ISD::SUB, MVT::i32, StackPointer, Size); + + // The Sub result contains the new stack start address, so it + // must be placed in the stack pointer register. + Chain = DAG.getCopyToReg(StackPointer.getValue(1), Mips::SP, Sub); + + // This node always has two return values: a new stack pointer + // value and a chain + SDValue Ops[2] = { Sub, Chain }; + return DAG.getMergeValues(Ops, 2); +} + +SDValue MipsTargetLowering:: LowerANDOR(SDValue Op, SelectionDAG &DAG) { SDValue LHS = Op.getOperand(0); Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.h?rev=54485&r1=54484&r2=54485&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsISelLowering.h (original) +++ llvm/trunk/lib/Target/Mips/MipsISelLowering.h Thu Aug 7 14:08:11 2008 @@ -93,6 +93,7 @@ SDValue LowerBRCOND(SDValue Op, SelectionDAG &DAG); SDValue LowerCALL(SDValue Op, SelectionDAG &DAG); SDValue LowerConstantPool(SDValue Op, SelectionDAG &DAG); + SDValue LowerDYNAMIC_STACKALLOC(SDValue Op, SelectionDAG &DAG); SDValue LowerFORMAL_ARGUMENTS(SDValue Op, SelectionDAG &DAG); SDValue LowerGlobalAddress(SDValue Op, SelectionDAG &DAG); SDValue LowerGlobalTLSAddress(SDValue Op, SelectionDAG &DAG); Modified: llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp?rev=54485&r1=54484&r2=54485&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsRegisterInfo.cpp Thu Aug 7 14:08:11 2008 @@ -249,6 +249,8 @@ for (int i = 0, e = MFI->getObjectIndexEnd(); i != e; ++i) { if (i >= MinCSFI && i <= MaxCSFI) continue; + if (MFI->isDeadObjectIndex(i)) + continue; unsigned Offset = MFI->getObjectOffset(i) - CalleeSavedAreaSize; if (LastOffsetFI == -1) LastOffsetFI = i; @@ -266,6 +268,7 @@ if (LastOffsetFI >= 0) StackOffset = MFI->getObjectOffset(LastOffsetFI)+ MFI->getObjectAlignment(LastOffsetFI); + StackOffset = ((StackOffset+StackAlign-1)/StackAlignStackAlign); for (unsigned i = 0, e = CSI.size(); i != e ; ++i) { if (CSI[i].getRegClass() != Mips::CPURegsRegisterClass) From bruno.cardoso at gmail.com Thu Aug 7 14:56:57 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Thu, 7 Aug 2008 16:56:57 -0300 Subject: [llvm-commits] SoftenFloatOp support for fp_round In-Reply-To: <200808062225.35791.baldrick@free.fr> References: <275e64e40807161139x699f650cx816bf9947e5b0ae9@mail.gmail.com> <200808040924.31674.baldrick@free.fr> <275e64e40808040938g29a4b1b6j87c85abaaf557e96@mail.gmail.com> <200808062225.35791.baldrick@free.fr> Message-ID: <275e64e40808071256x4225b81by931a3a0dddc6c934@mail.gmail.com> Hi Duncan, Commited. Thanks, -- Bruno Cardoso Lopes http://www.brunocardoso.cc "When faced with untenable alternatives, you should consider your imperative." From ggreif at gmail.com Thu Aug 7 16:46:04 2008 From: ggreif at gmail.com (Gabor Greif) Date: Thu, 07 Aug 2008 21:46:04 -0000 Subject: [llvm-commits] [llvm] r54490 - /llvm/trunk/docs/LangRef.html Message-ID: <200808072146.m77Lk5JY017152@zion.cs.uiuc.edu> Author: ggreif Date: Thu Aug 7 16:46:00 2008 New Revision: 54490 URL: http://llvm.org/viewvc/llvm-project?rev=54490&view=rev Log: use the more precise 'op1' instead of 'var1' since the latter can be misunderstood to not encompass constants Modified: llvm/trunk/docs/LangRef.html Modified: llvm/trunk/docs/LangRef.html URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/docs/LangRef.html?rev=54490&r1=54489&r2=54490&view=diff ============================================================================== --- llvm/trunk/docs/LangRef.html (original) +++ llvm/trunk/docs/LangRef.html Thu Aug 7 16:46:00 2008 @@ -2123,7 +2123,7 @@ Syntax: - <result> = add <ty> <var1>, <var2> ; yields {ty}:result* + <result> = add <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2165,7 +2165,7 @@ Syntax: - <result> = sub <ty> <var1>, <var2> ; yields {ty}:result + <result> = sub <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2211,7 +2211,7 @@ Syntax: - <result> = mul <ty> <var1>, <var2> ; yields {ty}:result + <result> = mul <ty> <op1>, <op2> ; yields {ty}:result Overview: The '`mul`' instruction returns the product of its two @@ -2248,7 +2248,7 @@ Syntax: - <result> = udiv <ty> <var1>, <var2> ; yields {ty}:result + <result> = udiv <ty> <op1>, <op2> ; yields {ty}:result Overview: The '`udiv`' instruction returns the quotient of its two @@ -2276,7 +2276,7 @@ Syntax: - <result> = sdiv <ty> <var1>, <var2> ; yields {ty}:result + <result> = sdiv <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2307,7 +2307,7 @@ Syntax: - <result> = fdiv <ty> <var1>, <var2> ; yields {ty}:result + <result> = fdiv <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2336,7 +2336,7 @@ Syntax: - <result> = urem <ty> <var1>, <var2> ; yields {ty}:result + <result> = urem <ty> <op1>, <op2> ; yields {ty}:result Overview: The '`urem`' instruction returns the remainder from the @@ -2366,7 +2366,7 @@ Syntax: - <result> = srem <ty> <var1>, <var2> ; yields {ty}:result + <result> = srem <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2385,8 +2385,8 @@ Semantics: This instruction returns the remainder of a division (where the result -has the same sign as the dividend, `var1`), not the modulo -operator (where the result has the same sign as the divisor, `var2`) of +has the same sign as the dividend, `op1`), not the modulo +operator (where the result has the same sign as the divisor, `op2`) of a value. For more information about the difference, see The Math Forum. For a table of how this is implemented in various languages, @@ -2412,7 +2412,7 @@ Syntax: - <result> = frem <ty> <var1>, <var2> ; yields {ty}:result + <result> = frem <ty> <op1>, <op2> ; yields {ty}:result Overview: The '`frem`' instruction returns the remainder from the @@ -2450,7 +2450,7 @@ Instruction Syntax: - <result> = shl <ty> <var1>, <var2> ; yields {ty}:result + <result> = shl <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2462,13 +2462,13 @@ Both arguments to the '`shl`' instruction must be the same integer or vector of integer -type. '`var2`' is treated as an unsigned value. +type. '`op2`' is treated as an unsigned value. Semantics: - The value produced is `var1` * 2^var2 mod 2ⁿ, -where n is the width of the result. If `var2` is (statically or dynamically) negative or -equal to or larger than the number of bits in `var1`, the result is undefined. + The value produced is `op1` * 2^op2 mod 2ⁿ, +where n is the width of the result. If `op2` is (statically or dynamically) negative or +equal to or larger than the number of bits in `op1`, the result is undefined. Example: <result> = shl i32 4, %var ; yields {i32}: 4 << %var @@ -2482,7 +2482,7 @@ Instruction Syntax: - <result> = lshr <ty> <var1>, <var2> ; yields {ty}:result + <result> = lshr <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2492,14 +2492,14 @@ Arguments: Both arguments to the '`lshr`' instruction must be the same integer or vector of integer -type. '`var2`' is treated as an unsigned value. +type. '`op2`' is treated as an unsigned value. Semantics: This instruction always performs a logical shift right operation. The most significant bits of the result will be filled with zero bits after the -shift. If `var2` is (statically or dynamically) equal to or larger than -the number of bits in `var1`, the result is undefined. +shift. If `op2` is (statically or dynamically) equal to or larger than +the number of bits in `op1`, the result is undefined. Example: @@ -2517,7 +2517,7 @@ Syntax: - <result> = ashr <ty> <var1>, <var2> ; yields {ty}:result + <result> = ashr <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2527,13 +2527,13 @@ Arguments: Both arguments to the '`ashr`' instruction must be the same integer or vector of integer -type. '`var2`' is treated as an unsigned value. +type. '`op2`' is treated as an unsigned value. Semantics: This instruction always performs an arithmetic shift right operation, The most significant bits of the result will be filled with the sign bit -of `var1`. If `var2` is (statically or dynamically) equal to or -larger than the number of bits in `var1`, the result is undefined. +of `op1`. If `op2` is (statically or dynamically) equal to or +larger than the number of bits in `op1`, the result is undefined. Example: @@ -2555,7 +2555,7 @@ Syntax: - <result> = and <ty> <var1>, <var2> ; yields {ty}:result + <result> = and <ty> <op1>, <op2> ; yields {ty}:result Overview: @@ -2614,7 +2614,7 @@ '`or`' Instruction Syntax: - <result> = or <ty> <var1>, <var2> ; yields {ty}:result + <result> = or <ty> <op1>, <op2> ; yields {ty}:result Overview: The '`or`' instruction returns the bitwise logical inclusive @@ -2669,7 +2669,7 @@ Instruction Syntax: - <result> = xor <ty> <var1>, <var2> ; yields {ty}:result + <result> = xor <ty> <op1>, <op2> ; yields {ty}:result Overview: The '`xor`' instruction returns the bitwise logical exclusive @@ -3805,7 +3805,7 @@ Syntax: - <result> = icmp <cond> <ty> <var1>, <var2> ; yields {i1}:result + <result> = icmp <cond> <ty> <op1>, <op2> ; yields {i1}:result Overview: The '`icmp`' instruction returns a boolean value based on comparison @@ -3829,7 +3829,7 @@ The remaining two arguments must be integer or pointer typed. They must also be identical types. Semantics: - The '`icmp`' compares `var1` and `var2` according to + The '`icmp`' compares `op1` and `op2` according to the condition code given as `cond`. The comparison performed always yields a i1 result, as follows: @@ -3839,21 +3839,21 @@ `ne`: yields `true` if the operands are unequal, `false` otherwise. No sign interpretation is necessary or performed. `ugt`: interprets the operands as unsigned values and yields - `true` if `var1` is greater than `var2`. + `true` if `op1` is greater than `op2`. `uge`: interprets the operands as unsigned values and yields - `true` if `var1` is greater than or equal to `var2`. + `true` if `op1` is greater than or equal to `op2`. `ult`: interprets the operands as unsigned values and yields - `true` if `var1` is less than `var2`. + `true` if `op1` is less than `op2`. `ule`: interprets the operands as unsigned values and yields - `true` if `var1` is less than or equal to `var2`. + `true` if `op1` is less than or equal to `op2`. `sgt`: interprets the operands as signed values and yields - `true` if `var1` is greater than `var2`. + `true` if `op1` is greater than `op2`. `sge`: interprets the operands as signed values and yields - `true` if `var1` is greater than or equal to `var2`. + `true` if `op1` is greater than or equal to `op2`. `slt`: interprets the operands as signed values and yields - `true` if `var1` is less than `var2`. + `true` if `op1` is less than `op2`. `sle`: interprets the operands as signed values and yields - `true` if `var1` is less than or equal to `var2`. + `true` if `op1` is less than or equal to `op2`. If the operands are pointer typed, the pointer values are compared as if they were integers. @@ -3873,7 +3873,7 @@ Syntax: - <result> = fcmp <cond> <ty> <var1>, <var2> ; yields {i1}:result + <result> = fcmp <cond> <ty> <op1>, <op2> ; yields {i1}:result Overview: The '`fcmp`' instruction returns a boolean value based on comparison @@ -3906,36 +3906,36 @@ floating point typed. They must have identical types. Semantics: - The '`fcmp`' instruction compares `var1` and `var2` + The '`fcmp`' instruction compares `op1` and `op2` according to the condition code given as `cond`. The comparison performed always yields a i1 result, as follows: `false`: always yields `false`, regardless of operands. `oeq`: yields `true` if both operands are not a QNAN and - `var1` is equal to `var2`. + `op1` is equal to `op2`. `ogt`: yields `true` if both operands are not a QNAN and - `var1` is greather than `var2`. + `op1` is greather than `op2`. `oge`: yields `true` if both operands are not a QNAN and - `var1` is greater than or equal to `var2`. + `op1` is greater than or equal to `op2`. `olt`: yields `true` if both operands are not a QNAN and - `var1` is less than `var2`. + `op1` is less than `op2`. `ole`: yields `true` if both operands are not a QNAN and - `var1` is less than or equal to `var2`. + `op1` is less than or equal to `op2`. `one`: yields `true` if both operands are not a QNAN and - `var1` is not equal to `var2`. + `op1` is not equal to `op2`. `ord`: yields `true` if both operands are not a QNAN. `ueq`: yields `true` if either operand is a QNAN or - `var1` is equal to `var2`. + `op1` is equal to `op2`. `ugt`: yields `true` if either operand is a QNAN or - `var1` is greater than `var2`. + `op1` is greater than `op2`. `uge`: yields `true` if either operand is a QNAN or - `var1` is greater than or equal to `var2`. + `op1` is greater than or equal to `op2`. `ult`: yields `true` if either operand is a QNAN or - `var1` is less than `var2`. + `op1` is less than `op2`. `ule`: yields `true` if either operand is a QNAN or - `var1` is less than or equal to `var2`. + `op1` is less than or equal to `op2`. `une`: yields `true` if either operand is a QNAN or - `var1` is not equal to `var2`. + `op1` is not equal to `op2`. `uno`: yields `true` if either operand is a QNAN. `true`: always yields `true`, regardless of operands. @@ -3954,7 +3954,7 @@ Syntax: - <result> = vicmp <cond> <ty> <var1>, <var2> ; yields {ty}:result + <result> = vicmp <cond> <ty> <op1>, <op2> ; yields {ty}:result Overview: The '`vicmp`' instruction returns an integer vector value based on @@ -3978,7 +3978,7 @@ The remaining two arguments must be vector of integer typed. They must also be identical types. Semantics: - The '`vicmp`' instruction compares `var1` and `var2` + The '`vicmp`' instruction compares `op1` and `op2` according to the condition code given as `cond`. The comparison yields a vector of integer result, of identical type as the values being compared. The most significant bit in each @@ -4000,7 +4000,7 @@ Syntax: - <result> = vfcmp <cond> <ty> <var1>, <var2> + <result> = vfcmp <cond> <ty> <op1>, <op2> Overview: The '`vfcmp`' instruction returns an integer vector value based on element-wise comparison of its two floating point vector operands. The output @@ -4031,7 +4031,7 @@ floating point typed. They must also be identical types. Semantics: - The '`vfcmp`' instruction compares `var1` and `var2` + The '`vfcmp`' instruction compares `op1` and `op2` according to the condition code given as `cond`. The comparison yields a vector of integer result, with an identical number of elements as the values being compared, and each element From baldrick at free.fr Thu Aug 7 17:25:11 2008 From: baldrick at free.fr (Duncan Sands) Date: Thu, 07 Aug 2008 22:25:11 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54491 - in /llvm-gcc-4.2/trunk/gcc/ada: Make-lang.in stub-ada.c Message-ID: <200808072225.m77MPBJ0018372@zion.cs.uiuc.edu> Author: baldrick Date: Thu Aug 7 17:25:09 2008 New Revision: 54491 URL: http://llvm.org/viewvc/llvm-project?rev=54491&view=rev Log: Make it once more possible to compile the Ada front-end using GNAT GPL 2006. This method has the advantage of the resulting compiler not producing warnings about the size of the restrictions symbol. Added: llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c Modified: llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in Modified: llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in?rev=54491&r1=54490&r2=54491&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in (original) +++ llvm-gcc-4.2/trunk/gcc/ada/Make-lang.in Thu Aug 7 17:25:09 2008 @@ -263,13 +263,20 @@ ada/widechar.o \ $(EXTRA_GNATBIND_OBJS) +# LLVM LOCAL begin +stub-ada.o : ada/stub-ada.c + $(CC) -c $(ALL_CFLAGS) $(ALL_ADA_CFLAGS) \ + $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) +# LLVM LOCAL end + # List of extra object files linked in with various programs. EXTRA_GNAT1_OBJS = prefix.o -EXTRA_GNATBIND_OBJS = prefix.o version.o +# LLVM LOCAL +EXTRA_GNATBIND_OBJS = prefix.o version.o stub-ada.o # Language-independent object files. # LLVM LOCAL -ADA_BACKEND = $(BACKEND) attribs.o stub-objc.o stub-c.o +ADA_BACKEND = $(BACKEND) attribs.o stub-objc.o stub-c.o stub-ada.o # List of target dependent sources, overridden below as necessary TARGET_ADA_SRCS = Added: llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c?rev=54491&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c (added) +++ llvm-gcc-4.2/trunk/gcc/ada/stub-ada.c Thu Aug 7 17:25:09 2008 @@ -0,0 +1,24 @@ +/* LLVM LOCAL file / +/ Stub functions for Ada language routines that are referenced + from the back-end. + Copyright (C) 2008 Free Software Foundation, Inc. + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. + +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. / + +/ Needed when building with GNAT GPL 2006. / +char system__restrictions__run_time_restrictions[1024] __attribute__ ((weak)); From isanbard at gmail.com Thu Aug 7 18:15:42 2008 From: isanbard at gmail.com (Bill Wendling) Date: Thu, 07 Aug 2008 23:15:42 -0000 Subject: [llvm-commits] [llvm] r54494 - /llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp Message-ID: <200808072315.m77NFgAg019834@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 18:15:41 2008 New Revision: 54494 URL: http://llvm.org/viewvc/llvm-project?rev=54494&view=rev Log: Pull r53924 into llvmCore-2062: Handle llvm wrappers. Modified: llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp Modified: llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp?rev=54494&r1=54493&r2=54494&view=diff ============================================================================== --- llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp (original) +++ llvm/tags/Apple/llvmCore-2062/lib/System/Path.cpp Thu Aug 7 18:15:41 2008 @@ -194,7 +194,10 @@ std::string actualMagic; if (!getMagicNumber(actualMagic, 4)) return false; - return actualMagic == "BC\xC0\xDE"; + LLVMFileType FT = + IdentifyFileType(actualMagic.c_str(), + static_cast(actualMagic.length())); + return FT == Bitcode_FileType; } bool Path::hasMagicNumber(const std::string &Magic) const { From isanbard at gmail.com Thu Aug 7 19:48:50 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 00:48:50 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54495 - /llvm-gcc-4.2/trunk/build_gcc Message-ID: <200808080048.m780mpSN022566@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 19:48:48 2008 New Revision: 54495 URL: http://llvm.org/viewvc/llvm-project?rev=54495&view=rev Log: Don't specify --with-gxx-include-dir. We use the system's g++ include directory. Modified: llvm-gcc-4.2/trunk/build_gcc Modified: llvm-gcc-4.2/trunk/build_gcc URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/build_gcc?rev=54495&r1=54494&r2=54495&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/build_gcc (original) +++ llvm-gcc-4.2/trunk/build_gcc Thu Aug 7 19:48:48 2008 @@ -120,8 +120,8 @@ if [ ! -d "/usr/include/c++/$LIBSTDCXX_VERSION" ]; then LIBSTDCXX_VERSION=4.0.0 fi +#NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=\${prefix}/include/c++/$LIBSTDCXX_VERSION" # LLVM LOCAL end -NON_ARM_CONFIGFLAGS="--with-gxx-include-dir=\${prefix}/include/c++/$LIBSTDCXX_VERSION" DARWIN_VERS=`uname -r \| sed 's/\..//'` echo DARWIN_VERS = $DARWIN_VERS From isanbard at gmail.com Thu Aug 7 19:50:18 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 00:50:18 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54496 - in /llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg: 5938756.m AppDelegate.h AppDelegate.m cfstring-nsstring-type.m compatibility-alias.m dwarf-prototypes.m encode-int128_t.m method-attribute-4.m objc-6061276.m objc-foreach-syntax.m objc-getter-bug.m objc2-6003871.m objc2-ivar-offset-2.m property-id-proto-getter.m property-in-category.m property-setter-bug.m property-specialized-1.m property-specialized-2.m super-after-trycatch.m sync-objc-exception.m Message-ID: <200808080050.m780oJf3022635@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 19:50:18 2008 New Revision: 54496 URL: http://llvm.org/viewvc/llvm-project?rev=54496&view=rev Log: Sync up the objc.dg testsuite with Apple's GCC testsuite. Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/5938756.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,24 @@ +/* APPLE LOCAL file 5938756 / +/ This code caused an ICE / +/ { dg-do compile } / +/ { dg-options "-gdwarf-2 -Os" } / + + at class NSException; + +struct empty { +}; + + at interface PC { +} + at end + + at implementation PC +- (id) fn { + signed char isSet = 0; + struct empty sb; + if (isSet) { + @try { } + @catch (NSException localException) { } + } +} + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.h Thu Aug 7 19:50:18 2008 @@ -0,0 +1,13 @@ +/* APPLE LOCAL file radar 5839812 - synthesized methods should be given + the location of the '@synthesize' statement. / +/ AppDelegate.m, AppDelegate.h / + +#import + + at interface AppDelegate : NSObject { + NSString name; +} + + at property (retain) NSString name; + + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/AppDelegate.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,18 @@ +/ APPLE LOCAL file radar 5839812 - synthesized methods should be given + the location of the '@synthesize' statement. / +/ AppDelegate.m, AppDelegate.h / +/ { dg-do compile } / +/ { dg-options " -O0 -gdwarf-2 -c -dA -mmacosx-version-min=10.5" { target powerpc--darwin* i?86--darwin* } } / +/ { dg-final { scan-assembler "AppDelegate.m:12" } } / + +#import "AppDelegate.h" + + at implementation AppDelegate + + at synthesize name; + +- (void)applicationDidFinishLaunching:(NSNotification )aNotification { + self.name = @"Fred"; +} + + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/cfstring-nsstring-type.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,31 @@ +/* APPLE LOCAL file radar 5982789 / +/ Type of a CFString literal is NSString. This test case + should not issue any warning as "length" is a method + in NSString class. +/ +/ { dg-options "-Wall -Werror" } / +/ { dg-do compile } / + +#import + + at interface MyTestClassA : NSObject +{ +} +- (short) length; + at end + + at implementation MyTestClassA +- (short) length; +{ + return 1; +} + at end + + +int main (int argc, const char argv[]) +{ + NSUInteger testLen = [@"teststring" length]; + NSLog(@"teststring: %ld", (long)testLen); + + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/compatibility-alias.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,21 @@ +/* APPLE LOCAL file radar 5835805 / +/ Test use of alias class name in defining a new class and its super class + results in proper diagnostics if class/super class is being mis-used. +/ +/ { dg-do compile } / + + at interface Super @end + + at interface MyWpModule @end + + at compatibility_alias MyAlias MyWpModule; + + at compatibility_alias AliasForSuper Super; + + at interface MyAlias : AliasForSuper // expected-error {{duplicate interface declaration for class 'MyWpModule'}} + at end / { dg-error "duplicate interface declaration for class 'MyWpModule'" } / + / { dg-error "redefinition of 'struct MyWpModule'" "" { target --* } 16 } / + + at implementation MyAlias : AliasForSuper / { dg-error "conflicting super class name 'Super'" } / + at end + Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/dwarf-prototypes.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,19 @@ +/ APPLE LOCAL file radar 4355182 / +/ Check that AT_prototyped is generated for objective-c as well. / +/ { dg-options "-mmacosx-version-min=10.5 -gdwarf-2 -dA" { target powerpc--darwin* i?86--darwin* } } / +/ { dg-options "-gdwarf-2 -dA" { target arm--darwin* } } / +/ { dg-final { scan-assembler "DW_AT_prototyped" } } / + +int foo (int); + +int +foo (int x) +{ + return x; +} + +int +main (int argc, char argv) +{ + return foo (5); +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/encode-int128_t.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,16 @@ +/* APPLE LOCAL file radar 5996271 / +/ encodeing support for 128-bit ints. / +/ { dg-do run } / + +extern void abort(void); + +int main () { +#if __LP64__ + if (@encode(__uint128_t)[0] != 'T') + abort(); + if (@encode(__int128_t)[0] != 't') + abort(); +#endif + return 0; +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/method-attribute-4.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,21 @@ +/ APPLE LOCAL file radar 6049617 / +/ Test of implementation of method attributes on class methods. / +/ { dg-do compile } / + + at interface NSString +- (const char )lossyCString __attribute__((deprecated)); ++ (const char )stringWithContentsOfFile __attribute__((deprecated)); + at end + +void foo (NSString p) +{ + id pid; + Class pclass; + + [p lossyCString]; /* { dg-warning "\\'lossyCString\\' is deprecated" } / + [NSString stringWithContentsOfFile]; / { dg-warning "\\'stringWithContentsOfFile\\' is deprecated" } / + + [pid lossyCString]; // OK + [pclass stringWithContentsOfFile]; // OK +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-6061276.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,35 @@ +/ APPLE LOCAL file radar 6061276 / +/ Corner protocol case should not result in any warning on line 32 / +/ { dg-do compile } / + +#import + + + at class ASTNode; + + at protocol ScopeLookup +- (ASTNode) containingScope; + at end + + at interface ASTNode : NSObject {} + at end + + at implementation ASTNode + at end + + at interface Expression : ASTNode {} + at end + + at implementation Expression +- (ASTNode) containingScope { return nil; } + at end + + at interface DeclarationContainingStatement : Expression {} + at end + + at implementation DeclarationContainingStatement +- (void)dummy { + ASTNode containingScope = [self containingScope]; + if (containingScope) {} +} + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-foreach-syntax.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,9 @@ +/* APPLE LOCAL file radar 5925639 / +/ { dg-options "-std=c99 -mmacosx-version-min=10.5" } / +/ { dg-do compile } / + +static int test_NSURLGetResourceValueForKey( id keys ) +{ + for ( id key; in keys) { / { dg-error "expected expression before" } / + } +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc-getter-bug.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,41 @@ +/ APPLE LOCAL file radar 5822637 / +/ Check that receiver of a getter call which is a messaging expression + does not call the message more than once. / +/ { dg-options "-mmacosx-version-min=10.5 -framework Foundation" } / +/ { dg-do run } / + +#include + +static int c; + + at interface I : NSObject +{ + int count; +} +- (NSArray )processResults; +- (int) Another; + at end + + at implementation I + +- (NSArray )processResults +{ + ++c; + return nil; +} + +- (int) Another +{ +int totalResults = [self processResults].count; +return 0; +} + at end + +int main() +{ + I p = [[I alloc] init]; + [p Another]; + + return c-1; +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-6003871.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,18 @@ +/* APPLE LOCAL file radar 6003871 / +/ { dg-do compile { target powerpc--darwin* i?86--darwin* } } / +/ { dg-options "-fnext-runtime -fobjc-gc" } / +/ { dg-do compile } / + +#import "Cocoa/Cocoa.h" + + at interface TEST : NSObject +{ + + int filesEnt[3000000]; +} + at end + + + at implementation TEST + at end + Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/objc2-ivar-offset-2.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,18 @@ +/* APPLE LOCAL file radar 5724385 / +/ Test that alignment of a bitfield is alignment of its underlying type. / +/ { dg-options "-std=c99 -mmacosx-version-min=10.5 -m64" { target powerpc--darwin* i?86--darwin* } } / +/ { dg-options "-std=c99" { target arm--darwin* } } / +/ { dg-do compile { target --darwin* } } / + + at interface Foo { + at private + int first; + int :1; + int third :1; + int :1; + int fifth :1; +} + at end + at implementation Foo + at end +/ { dg-final { scan-assembler "\t.quad\t_OBJC_IVAR_\\\$_Foo.third\n\t.quad\tL_OBJC_METH_VAR_NAME_1\n\t.quad\tL_OBJC_METH_VAR_TYPE_1\n\t.long\t2" } } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-id-proto-getter.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,20 @@ +/ APPLE LOCAL file radar 5893391 / +/ Test that property-style getter call syntax can be used on objects + of 'id' type qualified by protocols which implement the getter + method declared in that protocol. / +/ { dg-options "-mmacosx-version-min=10.5 -framework Foundation -fobjc-gc" { target powerpc--darwin* i?86--darwin* } } / +/ { dg-do run { target powerpc--darwin* i?86--darwin* } } / + +#include + +int main() +{ + id spam = [NSArray arrayWithObjects:@"Spam", @"spam", nil]; + NSString spamText= [ spam description ]; + id eggs = [NSArray arrayWithObjects:@"Spam", @"spam", nil]; + NSString eggsText= eggs.description; + NSObject bacon = [NSArray arrayWithObjects:@"Spam", @"spam", nil]; + NSString baconText= bacon.description; + NSLog(@"spam=%@, eggs=%@, bacon=%@", spamText, eggsText, baconText); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-in-category.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,32 @@ +/ APPLE LOCAL file radar 5962694 / +/ Test that a property declared in category's protocol list can be + synthesize (dynamic only) in category's implementation. / +/ { dg-options "-mmacosx-version-min=10.5" { target --darwin* } } / +/ { dg-do compile { target --darwin* } } / + +#import + + at protocol MyProtocol + at property float myFloat; + at end + + at interface MyObject : NSObject { + } + at end + + at interface MyObject (MyProtocol) + at end + + at implementation MyObject (MyProtocol) + at dynamic myFloat; + at end + +int main (int argc, const char argv[]) { + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + + // insert code here... + NSLog(@"Hello, World!"); + [pool drain]; + return 0; +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-setter-bug.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,86 @@ +/* APPLE LOCAL file radar 5852190 / +/ { dg-options "-mmacosx-version-min=10.5 -framework Cocoa" } / +/ { dg-do run { target powerpc--darwin* i?86--darwin* } } / + +#import + + at interface Foo : NSObject +{ + at public + BOOL _gratuitousBool; + NSString _assignedString; + NSString* _retainedString; + NSString* _copiedString; +} + + at property BOOL gratuitousBool; + at property (assign) NSString* assignedString; + at property (retain) NSString* retainedString; + at property (copy) NSString* copiedString; + +- (BOOL)gratuitousBool; +- (NSString)assignedString; +- (NSString)retainedString; +- (NSString)copiedString; + +-(void)setGratuitousBool:(BOOL)gratuitousBool; +-(void)setAssignedString:(NSString)assignedString; +-(void)setRetainedString:(NSString)retainedString; +-(void)setCopiedString:(NSString)copiedString; + + at end + +//--------------------------------------------------------------------------- + + at implementation Foo + + at synthesize gratuitousBool = _gratuitousBool; + at synthesize assignedString = _assignedString; + at synthesize retainedString = _retainedString; + at synthesize copiedString = _copiedString; + +- (id)init +{ + self = [super init]; + if(self == nil) return nil; + + self.gratuitousBool = YES; + self.assignedString = @"AssignedString"; + self.retainedString = @"RetainedString"; + self.copiedString = @"CopiedString"; + + return self; +} + + at end + +//*************************************************************************** + +static void TestGratuitousBool(Foo* foo) +{ + NSLog(@"gratuitousBool initial value: %d", foo.gratuitousBool); + if (foo.gratuitousBool != YES) + abort(); + foo.gratuitousBool = NO; + NSLog(@"gratuitousBool new value: %d", foo.gratuitousBool); + if (foo.gratuitousBool != NO) + abort(); + + const BOOL oldGratuitousBool = foo.gratuitousBool; + foo->_gratuitousBool = YES; + NSCAssert(foo.gratuitousBool == YES, @"-gratuitousBool is borked"); + foo->_gratuitousBool = oldGratuitousBool; +} + +int main(const int argc, const char* const argv[]) +{ + NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; + + Foo* foo = [[Foo alloc] init]; + + TestGratuitousBool(foo); + + [pool release]; + + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-1.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,26 @@ +/* APPLE LOCAL file radar 5218071 / +/ Test that property type in the derived class can be more specialized than + that of its base class. +/ +/ { dg-options "-mmacosx-version-min=10.5" } / +/ { dg-do compile } / + + at protocol P1 @end + at protocol P2 @end + at protocol P3 @end + + at interface NSData @end + + at interface MutableNSData : NSData @end + + at interface Base + at property(readonly) id ref; + at property(readonly) id another_ref; + at property (readonly) NSData nsdata; + at end + + at interface Derived : Base + at property (readonly, assign) NSData ref; + at property(readonly) NSData another_ref; + at property (readonly) NSData * nsdata; + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/property-specialized-2.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,36 @@ +/* APPLE LOCAL file radar 5218071 / +/ Test that property type in the derived class can be more specialized than + that of its base class. Issue warning when this is not the case. +/ +/ { dg-options "-mmacosx-version-min=10.5" } / +/ { dg-do compile } / + + at protocol P1 @end + at protocol P2 @end + at protocol P3 @end + + at interface NSData @end + + at interface MutableNSData : NSData @end + + at interface Base : NSData + at property(readonly) id ref; + at property(readonly) Base p_base; + at property(readonly) NSData nsdata; + at property(readonly) NSData m_nsdata; + at end + + at interface Data : Base + at property(readonly) NSData ref; + at property(readonly) Data p_base; // warn + at property(readonly) MutableNSData * m_nsdata; + at end /* { dg-warning "property 'p_base' type does not match super class 'Base' property type" } / + + at interface MutedData: Data + at property(readonly) id p_base; + at end / { dg-warning "property 'p_base' type does not match super class 'Data' property type" } / + + at interface ConstData : Data + at property(readonly) ConstData p_base; + at end /* { dg-warning "property 'p_base' type does not match super class 'Data' property type" } / + Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/super-after-trycatch.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,27 @@ +/ APPLE LOCAL file radar 6023694 / +/ Test that no bogus warning is issued as the result of + 'super' being 'volatized' for a try-catch statement. / +/ { dg-options "-Wall" } / +/ { dg-do compile } / + + at interface NSObject { +} +- (unsigned)retainCount; + at end + + at interface Foo : NSObject { +} + at end + + at implementation Foo + +- (unsigned)retainCount +{ + [super retainCount]; + @try { + } @catch(id anything) { + } + return [super retainCount]; +} + + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m?rev=54496&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/objc.dg/sync-objc-exception.m Thu Aug 7 19:50:18 2008 @@ -0,0 +1,27 @@ +/ APPLE LOCAL file radar 5982990 / +/ This tests that local variables declared in @synchronized block + have are make volatile. Test should compile with no warning or + error. +/ +/ { dg-do compile { target powerpc--darwin* i?86--darwin* } } / +/ { dg-options "-fobjc-exceptions -Os -Wextra -Werror" } / +/ { dg-skip-if "" { --darwin* } { "-m64" } { "" } } / + +struct MyPoint { int x; }; + + at interface MyObject {} ++(void) doNothingWithPoint:(struct MyPoint)aPoint; + at end + +int main() +{ + id pool = 0; + + @synchronized(pool) + { + struct MyPoint thePoint; + [MyObject doNothingWithPoint:thePoint]; + } + + return 0; +} From isanbard at gmail.com Thu Aug 7 19:51:11 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 00:51:11 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54497 - in /llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg: cfstring-nsstring-type.mm inline-func-access-category.mm objc-gc-static-init.mm property-getter-codegen.mm property-id-proto-getter.mm property-reference-1.mm property-reference-2.mm property-reference-3.mm sync-objc-exception.mm template-in-impl.mm utf16string-in-functemplate.mm Message-ID: <200808080051.m780pBUn022680@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 19:51:11 2008 New Revision: 54497 URL: http://llvm.org/viewvc/llvm-project?rev=54497&view=rev Log: Sync up obj-c++.dg testsuites with Apple's GCC obj-c++.dg. Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/cfstring-nsstring-type.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/inline-func-access-category.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-gc-static-init.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-getter-codegen.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-id-proto-getter.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-1.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-2.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-3.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/sync-objc-exception.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/template-in-impl.mm llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/utf16string-in-functemplate.mm Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/cfstring-nsstring-type.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/cfstring-nsstring-type.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/cfstring-nsstring-type.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/cfstring-nsstring-type.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,31 @@ +/ APPLE LOCAL file radar 5982789 / +/ Type of a CFString literal is NSString. This test case + should not issue any warning as "length" is a method + in NSString class. +/ +/ { dg-options "-Wall -Werror" } / +/ { dg-do compile } / + +#include + + at interface MyTestClassA : NSObject +{ +} +- (short) length; + at end + + at implementation MyTestClassA +- (short) length; +{ + return 1; +} + at end + + +int main (int argc, const char argv[]) +{ + NSUInteger testLen = [@"teststring" length]; + NSLog(@"teststring: %ld", (long)testLen); + + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/inline-func-access-category.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/inline-func-access-category.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/inline-func-access-category.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/inline-func-access-category.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,22 @@ +/* APPLE LOCAL file radar 5471096 / +/ Test that an inlinable function in cateogry block has access to + protected/private member of its class though pointer to the class. / +/ { dg-do compile } / + + at interface B + { + int intValue; + } + at end + + + at interface B() + +inline static int B_intValue(B self) + { return self->intValue; } + + at end + + at implementation B + + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-gc-static-init.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/objc-gc-static-init.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-gc-static-init.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/objc-gc-static-init.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,47 @@ +/* APPLE LOCAL file radar 5733674 / +/ Test that static GC'able objects are garbage collected by generating write barrier. + Test should build and run. / +/ { dg-options "-fobjc-gc -mmacosx-version-min=10.5 -framework Foundation" } / +/ { dg-do run { target --darwin* } } / +/ { dg-require-effective-target objc_gc } / + +#import + + at interface Test : NSObject +{ +} + at end + at implementation Test + +static NSString createMacOSXVersionString() +{ + return [[NSString alloc] initWithString:[[NSDate date] description]]; +} + +- (void)getString +{ + static NSString string = createMacOSXVersionString(); + NSLog(@"string: %@", string); + NSLog(@"string: %p", string); +} + + at end + + + +int main (int argc, const char argv[]) { + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + + Test testClass = [[Test alloc] init]; + unsigned counter, max = 4; + for (counter = 0; counter < max; counter++) { + [testClass getString]; + [[NSGarbageCollector defaultCollector] collectExhaustively]; + } + [testClass release]; + + // insert code here... + NSLog(@"Hello, World!"); + [pool drain]; + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-getter-codegen.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-getter-codegen.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-getter-codegen.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-getter-codegen.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,115 @@ +/ APPLE LOCAL file radar 5802025 / +/ This test case used to ICE because we did not generate a getter call from + OBJC_PROPERTY_REFERENCE_EXPR in time to access the property getter value when + getter is retuning a class. +/ +/ { dg-options "-mmacosx-version-min=10.5 -framework Foundation" { target powerpc--darwin* i?86--darwin* } } / +/ { dg-options "-framework Foundation" { target arm--darwin* } } / +/ { dg-do run { target --darwin* } } / + +#import +#import + +class Vector3D +{ + public: + float x, y, z; + + public: + Vector3D(); + Vector3D(const Vector3D &inVector); + Vector3D(float initX, float initY, float initZ); + Vector3D &operator=(const Vector3D & rhs); + + NSString description(); +}; + +Vector3D::Vector3D() +{ + x = y = z = 0; +} + +Vector3D::Vector3D(const Vector3D &inVector) +{ + x = inVector.x; + y = inVector.y; + z = inVector.z; +} + +Vector3D::Vector3D(float initX, float initY, float initZ) +{ + x = initX; + y = initY; + z = initZ; +} + +Vector3D &Vector3D::operator=(const Vector3D & rhs) +{ + x = rhs.x; + y = rhs.y; + z = rhs.z; + + return this; +} + +NSString Vector3D::description() +{ + return [NSString stringWithFormat: @"(%f, %f, %f)", x, y, z]; +} + + at interface Object3D : NSObject +{ + Vector3D position; +} + + at property (assign) Vector3D position; + at end + +static int count; + + at implementation Object3D + + at synthesize position; + +- (id) init +{ + self = [super init]; + if(self) + { + position = Vector3D(0, 0, 0); + } + + return self; +} + +- (void) setPosition: (Vector3D) inPosition +{ + position = inPosition; + NSLog(@"setPosition was called with the vector %@", inPosition.description()); + ++count; +} + at end + +int main (int argc, const char * argv[]) +{ + NSAutoreleasePool pool = [[NSAutoreleasePool alloc] init]; + + Object3D myObject = [[Object3D alloc] init]; + + // Each of these looks like it should call the setPosition method. However, + // if the Vector3D copy constructor is defined, this one won't. + myObject.position = Vector3D(1.0f, 1.0f, 1.0f); + NSLog(@"After assignment the position is: %@", myObject.position.description()); + + [myObject setPosition: Vector3D(2.0f, 2.0f, 2.0f)]; + NSLog(@"After setPosition: the position is: %@", myObject.position.description()); + + typedef void (SetPositionIMP)(id self, SEL _cmd, Vector3D position); + ((SetPositionIMP)objc_msgSend)(myObject, @selector(setPosition:), Vector3D(3.0f, 3.0f, 3.0f)); + NSLog(@"After objc_msgSend the position is: %@", myObject.position.description()); + + [pool release]; + if (count != 3) + abort(); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-id-proto-getter.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-id-proto-getter.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-id-proto-getter.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-id-proto-getter.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,20 @@ +/ APPLE LOCAL file radar 5893391 / +/ Test that property-style getter call syntax can be used on objects + of 'id' type qualified by protocols which implement the getter + method declared in that protocol. / +/ { dg-options "-mmacosx-version-min=10.5 -framework Foundation -fobjc-gc" { target powerpc--darwin* i?86--darwin* } } / +/ { dg-do run { target powerpc--darwin* i?86--darwin* } } / + +#include + +int main() +{ + id spam = [NSArray arrayWithObjects:@"Spam", @"spam", nil]; + NSString spamText= [ spam description ]; + id eggs = [NSArray arrayWithObjects:@"Spam", @"spam", nil]; + NSString eggsText= eggs.description; + NSObject bacon = [NSArray arrayWithObjects:@"Spam", @"spam", nil]; + NSString baconText= bacon.description; + NSLog(@"spam=%@, eggs=%@, bacon=%@", spamText, eggsText, baconText); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-1.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-reference-1.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-1.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-1.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,28 @@ +/ APPLE LOCAL file radar 6029624 / +/ Test for const refrence property types. / +/ { dg-options "-mmacosx-version-min=10.5" } / +/ { dg-do compile { target --darwin* } } / + +struct MyStruct +{ + float x; + float y; + float z; +}; + + at interface MyClass +{ + MyStruct foo; +} + + at property (assign, readwrite) const MyStruct& foo; + at property (assign, readwrite) const MyStruct& Myfoo; + + at end + + at implementation MyClass + + at synthesize Myfoo = foo; + at synthesize foo; + + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-2.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-reference-2.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-2.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-2.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,25 @@ +/ APPLE LOCAL file radar 6029624 / +/ Test for const refrence property types. / +/ { dg-options "-m64 -mmacosx-version-min=10.5" } / +/ { dg-do compile { target --darwin* } } / + +struct MyStruct +{ + float x; + float y; + float z; +}; + + at interface MyClass + + at property (assign, readwrite) const MyStruct& foo; + at property (assign, readwrite) const MyStruct& Myfoo; + + at end + + at implementation MyClass + + at synthesize Myfoo; + at synthesize foo; + + at end Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-3.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/property-reference-3.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-3.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/property-reference-3.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,51 @@ +/ APPLE LOCAL file radar 6029577 / +/ Test for correct generation of getters which return reference typed ivars. / +/ { dg-options "-framework Foundation -mmacosx-version-min=10.5" } / +/ { dg-do run { target --darwin* } } / + +#include + +struct MyStruct +{ + int x; + int y; + int z; +}; + + at interface MyClass : NSObject +{ + MyStruct _foo; +} + + at property (assign, readwrite) const MyStruct& foo; + +- (const MyStruct&) foo; +- (void) setFoo:(const MyStruct&)inFoo; + at end + + at implementation MyClass + +- (const MyStruct&) foo +{ + return _foo; +} + +- (void) setFoo:(const MyStruct&)inFoo +{ + _foo = inFoo; +} + at end + +int main() +{ + MyClass myClass = [[MyClass alloc] init]; + + MyStruct myStruct = (MyStruct){1, 2, 3}; + myClass.foo = myStruct; + + const MyStruct& currentMyStruct = myClass.foo; + if (currentMyStruct.x != 1 \|\| currentMyStruct.y != 2 \|\| currentMyStruct.z != 3) + abort(); + return 0; +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/sync-objc-exception.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/sync-objc-exception.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/sync-objc-exception.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/sync-objc-exception.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,27 @@ +/* APPLE LOCAL file radar 5982990 / +/ This tests that local variables declared in @synchronized block + have are make volatile. Test should compile with no warning or + error. +/ +/ { dg-do compile { target powerpc--darwin* i?86--darwin* } } / +/ { dg-options "-fobjc-exceptions -Os -Wextra -Werror" } / +/ { dg-skip-if "" { --darwin* } { "-m64" } { "" } } / + +struct MyPoint { int x; }; + + at interface MyObject {} ++(void) doNothingWithPoint:(struct MyPoint)aPoint; + at end + +int main() +{ + id pool = 0; + + @synchronized(pool) + { + struct MyPoint thePoint; + [MyObject doNothingWithPoint:thePoint]; + } + + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/template-in-impl.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/template-in-impl.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/template-in-impl.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/template-in-impl.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,25 @@ +/ APPLE LOCAL file radar 5976344 / +/ Test that class template can be properly parsed and handled inside + an @implementation. / + +/ { dg-do compile } / + +template struct TemplateDeclarationIsFineHere {}; + +template struct Template2 {}; + + at interface Test @end + + at implementation Test + +- (void) test { + Template2 youCanInstantiateTemplatesNoProblem(); +} + +template struct TemplateDeclarationIsNoGoodHere {}; + +- (TemplateDeclarationIsNoGoodHere) Meth { return 0; } + + + at end + Added: llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/utf16string-in-functemplate.mm URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/obj-c%2B%2B.dg/utf16string-in-functemplate.mm?rev=54497&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/utf16string-in-functemplate.mm (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/obj-c++.dg/utf16string-in-functemplate.mm Thu Aug 7 19:51:11 2008 @@ -0,0 +1,13 @@ +/* APPLE LOCAL file radar 5887355 / +/ Test correct generation of utf16-string in a function template. / +/ { dg-options "-framework Cocoa" } / +/ { dg-do run { target --darwin* } } / + +#import + +template NSString test (T i) { return @"??ble"; } + +main () { + NSLog (@"string: %@", test(42)); + return 0; +} From isanbard at gmail.com Thu Aug 7 19:52:12 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 00:52:12 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54498 - /llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c Message-ID: <200808080052.m780qCEX022716@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 19:52:12 2008 New Revision: 54498 URL: http://llvm.org/viewvc/llvm-project?rev=54498&view=rev Log: Sync up the gcc.c-torture/execute testsuites with Apple's GCC testsuite. Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c?rev=54498&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.c-torture/execute/align-3.c Thu Aug 7 19:52:12 2008 @@ -0,0 +1,15 @@ +/* APPLE LOCAL file mainline aligned functions 5933878 / +void func(void) __attribute__((aligned(256))); + +void func(void) +{ +} + +int main() +{ + if (((long)func & 0xFF) != 0) + abort (); + if (__alignof__(func) != 256) + abort (); + return 0; +} From isanbard at gmail.com Thu Aug 7 20:03:12 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 01:03:12 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54499 - /llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ Message-ID: <200808080103.m7813DkZ023080@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 20:03:11 2008 New Revision: 54499 URL: http://llvm.org/viewvc/llvm-project?rev=54499&view=rev Log: Add non-blocks tests. Blocks tests will come later with a blocks support update. Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5774356.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,45 @@ +/ APPLE LOCAL file 5774356 / +/ { dg-do run { target powerpc--* } } / +/ { dg-require-effective-target powerpc_altivec_ok } / + +#include +#include + +#define NOINLINE __attribute__ ((__noinline__)) + +typedef int __attribute__((vector_size(16))) v4si; + +int global_count; +v4si ref1 = { 1, 1, 1, 1 }; +v4si ref2 = { 2, 2, 2, 2 }; +v4si var1 = { 1, 1, 1, 1 }; +v4si var2 = { 2, 2, 2, 2 }; + +void NOINLINE f0 () +{ + global_count++; +} + +void NOINLINE f1 () +{ + v4si t = var1; + f0 (); + var1 = t; +} + +void NOINLINE f2 () +{ + v4si t = var2; + f1 (); + var2 = t; +} + +main () +{ + f2 (); + if (!vec_all_eq (var1, ref1)) + abort (); + if (!vec_all_eq (var2, ref2)) + abort (); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5799099.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,21 @@ +/ APPLE LOCAL file 5799099 / +/ { dg-do compile } / +/ { dg-options "-O" } / +typedef struct CGSZone { + void context; + void (free)(void context, void ptr); +} CGSZone; + +static void +CGSZoneFree(CGSZone zone, void ptr) +{ + (zone->free)(zone->context, ptr); +} + +void +release_bitmap_data(void info, const void data) +{ + /* The compiler should not warn when we explicitly cast away "const" + here: / + CGSZoneFree(info, (void )data); +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/5951842.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,12 @@ +/* APPLE LOCAL file 5951842 / +/ { dg-do compile { target "i?86--darwin" } } / +/ { dg-options "-O1" } / + / Should generate one SSE2 insn; under -O1 -m64, was shifting in rdx:rax. / +/ { dg-final { scan-assembler "psrldq" } } / +#include +__m128i +f (__m128i v_row) +{ + / This is a 40-bit left shift. / + return _mm_srli_si128(v_row, 5); +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/arm-ne-zero.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,20 @@ +/ APPLE LOCAL file 4382996 / +/ Verify that the result of a binary operator != 0 doesn't generate a + redundant move instruction. / + +/ { dg-do compile { target arm--darwin* } } / +/ { dg-options "-Os" } / +/ { dg-skip-if "Not valid with -mthumb" { --* } { "-mthumb" } { "" } } / + +int test_plus (int a, int b) { return (a + b) != 0; } +int test_and (int a, int b) { return (a & b) != 0; } +int test_minus (int a, int b) { return (a - b) != 0; } +int test_mult (int a, int b) { return (a b) != 0; } +int test_ior (int a, int b) { return (a \| b) != 0; } +int test_xor (int a, int b) { return (a ^ b) != 0; } +int test_ashift (int a, int b) { return (a << b) != 0; } +int test_ashiftrt (int a, int b) { return (a >> b) != 0; } +unsigned int test_lshiftrt (unsigned int a, unsigned int b) { return (a >> b) != 0; } + +/* { dg-final { scan-assembler-times "movne" 9 } } / +/ { dg-final { scan-assembler-not "moveq" } } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,63 @@ +/ APPLE LOCAL file bswap support / +/ Test for generation of architecture-specific endianness-swap instructions. / +/ { dg-do compile } / + +/ These tests should work at -O1 and above. / +/ { dg-options "-O1 -std=gnu99" } / + +extern void abort(void); +typedef unsigned int uint32; +typedef unsigned long long uint64; +uint32 Reverse1 (uint32) __attribute__((noinline)); +uint32 Reverse2 (uint32) __attribute__((noinline)); +unsigned int Reverse3 (unsigned int) __attribute__((noinline)); +uint64 llReverse1 (uint64) __attribute__((noinline)); +uint64 llReverse2 (uint64) __attribute__((noinline)); +unsigned long long llReverse3 (unsigned long long) __attribute__((noinline)); + +uint32 Reverse1 (uint32 x) { + return (x<<24) \| ((x<<8) & 0x00ff0000) \| ((x>>8) & 0x0000ff00) \| (x>>24); +} +uint32 Reverse2 (uint32 x) { + return ((x<<24) & 0xff000000) \| ((x<<8) & 0x00ff0000) \| ((x>>8) & 0x0000ff00) \| ((x>>24) & 0x000000ff); +} +unsigned int Reverse3 (unsigned int x) { + return ((x & 0x0000ff00) <<8) \| ((x & 0x00ff0000) >> 8) \| ((x & 0xff000000) >> 24) \| ((x & 0x000000ff) << 24); +} + +uint64 llReverse1 (uint64 x) { + return ((x&0xFF00000000000000ull)>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000FF00000000ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| ((x&0x00000000000000FFull)<<56); +} +uint64 llReverse2 (uint64 x) { + return (x>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000FF00000000ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| (x<<56); +} +unsigned long long llReverse3 (unsigned long long x) { + return ((x<<40)&0x00FF000000000000ull) \| ((x<<24)&0x0000FF0000000000ull) + \| ((x>>8)&0x00000000FF000000ull) \| ((x>>24)&0x0000000000FF0000ull) \| ((x<<56)&0xFF00000000000000ull) \| ((x<<8)&0x000000FF00000000ull) + \| ((x>>40)&0x000000000000FF00ull) \| ((x>>56)&0x00000000000000FFull); +} + +int main() { + unsigned int x = 0x12345678; + unsigned long long y = 0x123456789abcdef0ull; + if (Reverse1(x) != 0x78563412) + abort(); + if (Reverse2(x) != 0x78563412) + abort(); + if (Reverse3(x) != 0x78563412) + abort(); + if (llReverse1(y) != 0xf0debc9a78563412ull) + abort(); + if (llReverse2(y) != 0xf0debc9a78563412ull) + abort(); + if (llReverse3(y) != 0xf0debc9a78563412ull) + abort(); + return 0; +} +/ The capital R's throughout are so these match only instructions: / +/ { dg-final { if [ istarget arm--darwin* ] { global compiler_flags; if [string match "-march=armv6" $compiler_flags] { scan-assembler-times "\\\trev" 9 } } } } / +/ { dg-final { if [ istarget i?86--darwin ] { global compiler_flags; if ![string match "-m64 " $compiler_flags] { scan-assembler-times "\\\tbswap" 3 } } } } / +/ { dg-final { if [ istarget i?86--darwin ] { global compiler_flags; if [string match "-m64 " $compiler_flags] { scan-assembler-times "\\\tbswap" 6 } } } } / + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-2.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,69 @@ +/ APPLE LOCAL file bswap support / +/ These cases should NOT generate bswap. / +/ { dg-do compile } / +/ { dg-options "-O1 -std=gnu99" } / + +typedef unsigned int uint32; +typedef unsigned long long uint64; +extern void abort(void); +uint32 f (uint32) __attribute__((noinline)); +uint64 llf (uint64) __attribute__((noinline)); +unsigned int Reverse4 (volatile unsigned int) __attribute__((noinline)); +uint32 Reverse5 (uint32) __attribute__((noinline)); +unsigned int Reverse6 (unsigned int) __attribute__((noinline)); +uint64 llReverse4 (volatile uint64) __attribute__((noinline)); +unsigned long long llReverse5 (unsigned long long) __attribute__((noinline)); +uint64 llReverse6 (uint64) __attribute__((noinline)); + +static int count = 0; +static int llcount = 0; +uint32 f(uint32 x) { count++; return x; } +uint64 llf(uint64 x) { llcount++; return x; } + +unsigned int Reverse4 (volatile unsigned int x) { / does NOT produce Rev / + return ((x & 0x0000ff00) <<8) \| ((x & 0x00ff0000) >> 8) \| ((x & 0xff000000) >> 24) \| ((x & 0x000000ff) << 24); +} +uint32 Reverse5 (uint32 x) { / does NOT produce Rev / + return ((f(x) & 0x0000ff00) <<8) \| ((f(x) & 0x00ff0000) >> 8) \| ((f(x) & 0xff000000) >> 24) \| ((f(x) & 0x000000ff) << 24); +} +unsigned int Reverse6 (unsigned int x) { + return ((x & 0x0000ff00) <<8) \| ((x & 0x0000ff00) >> 8) \| ((x & 0xff000000) >> 24) \| ((x & 0x000000ff) << 24); +} + +uint64 llReverse4 (volatile uint64 x) { + return ((x&0xFF00000000000000ull)>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000FF00000000ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| ((x&0x00000000000000FFull)<<56); +} +unsigned long long llReverse5 (unsigned long long x) { + return ((llf(x)&0xFF00000000000000ull)>>56) \| ((llf(x)&0x00FF000000000000ull)>>40) \| ((llf(x)&0x0000FF0000000000ull)>>24) \| ((llf(x)&0x000000FF00000000ull)>> 8) + \| ((llf(x)&0x00000000FF000000ull)<< 8) \| ((llf(x)&0x0000000000FF0000ull)<<24) \| ((llf(x)&0x000000000000FF00ull)<<40) \| ((llf(x)&0x00000000000000FFull)<<56); +} +uint64 llReverse6 (uint64 x) { + return ((x&0xFF00000000000000ull)>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000000000ff00ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| ((x&0x00000000000000FFull)<<56); +} +int main() { + unsigned int x = 0x12345678; + unsigned long long y = 0x123456789abcdef0ull; + if (Reverse4(x) != 0x78563412) + abort(); + if (Reverse5(x) != 0x78563412) + abort(); + if (count != 4) + abort(); + if (Reverse6(x) != 0x78560056) + abort(); + if (llReverse4(y) != 0xf0debc9a78563412ull) + abort(); + if (llReverse5(y) != 0xf0debc9a78563412ull) + abort(); + if (llcount != 8) + abort(); + if (llReverse6(y) != 0xf0debc9a005634deull) + abort(); + return 0; +} + +/ { dg-final { if [ istarget arm--darwin* ] { scan-assembler-not "\\\trev" } } } / +/ { dg-final { if [ istarget i?86--darwin ] { scan-assembler-not "\\\tbswap" } } } / + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-3.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,55 @@ +/ APPLE LOCAL file bswap support / +/ { dg-do run } / +/ { dg-options "-O2 -std=gnu99" } / + +extern void abort(void); +typedef unsigned int uint32; +typedef unsigned long long uint64; +uint32 Reverse1 (uint32) __attribute__((noinline)); +uint32 Reverse2 (uint32) __attribute__((noinline)); +unsigned int Reverse3 (unsigned int) __attribute__((noinline)); +uint64 llReverse1 (uint64) __attribute__((noinline)); +uint64 llReverse2 (uint64) __attribute__((noinline)); +unsigned long long llReverse3 (unsigned long long) __attribute__((noinline)); + +uint32 Reverse1 (uint32 x) { + return (x<<24) \| ((x<<8) & 0x00ff0000) \| ((x>>8) & 0x0000ff00) \| (x>>24); +} +uint32 Reverse2 (uint32 x) { + return ((x<<24) & 0xff000000) \| ((x<<8) & 0x00ff0000) \| ((x>>8) & 0x0000ff00) \| ((x>>24) & 0x000000ff); +} +unsigned int Reverse3 (unsigned int x) { + return ((x & 0x0000ff00) <<8) \| ((x & 0x00ff0000) >> 8) \| ((x & 0xff000000) >> 24) \| ((x & 0x000000ff) << 24); +} + +uint64 llReverse1 (uint64 x) { + return ((x&0xFF00000000000000ull)>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000FF00000000ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| ((x&0x00000000000000FFull)<<56); +} +uint64 llReverse2 (uint64 x) { + return (x>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000FF00000000ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| (x<<56); +} +unsigned long long llReverse3 (unsigned long long x) { + return ((x<<40)&0x00FF000000000000ull) \| ((x<<24)&0x0000FF0000000000ull) + \| ((x>>8)&0x00000000FF000000ull) \| ((x>>24)&0x0000000000FF0000ull) \| ((x<<56)&0xFF00000000000000ull) \| ((x<<8)&0x000000FF00000000ull) + \| ((x>>40)&0x000000000000FF00ull) \| ((x>>56)&0x00000000000000FFull); +} + +int main() { + unsigned int x = 0x12345678; + unsigned long long y = 0x123456789abcdef0ull; + if (Reverse1(x) != 0x78563412) + abort(); + if (Reverse2(x) != 0x78563412) + abort(); + if (Reverse3(x) != 0x78563412) + abort(); + if (llReverse1(y) != 0xf0debc9a78563412ull) + abort(); + if (llReverse2(y) != 0xf0debc9a78563412ull) + abort(); + if (llReverse3(y) != 0xf0debc9a78563412ull) + abort(); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-4.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,65 @@ +/ APPLE LOCAL file bswap support / +/ These cases should NOT generate bswap. / +/ { dg-do run } / +/ { dg-options "-O2 -std=gnu99" } / + +typedef unsigned int uint32; +typedef unsigned long long uint64; +extern void abort(void); +uint32 f (uint32) __attribute__((noinline)); +uint64 llf (uint64) __attribute__((noinline)); +unsigned int Reverse4 (volatile unsigned int) __attribute__((noinline)); +uint32 Reverse5 (uint32) __attribute__((noinline)); +unsigned int Reverse6 (unsigned int) __attribute__((noinline)); +uint64 llReverse4 (volatile uint64) __attribute__((noinline)); +unsigned long long llReverse5 (unsigned long long) __attribute__((noinline)); +uint64 llReverse6 (uint64) __attribute__((noinline)); + +static int count = 0; +static int llcount = 0; +uint32 f(uint32 x) { count++; return x; } +uint64 llf(uint64 x) { llcount++; return x; } + +unsigned int Reverse4 (volatile unsigned int x) { / does NOT produce Rev / + return ((x & 0x0000ff00) <<8) \| ((x & 0x00ff0000) >> 8) \| ((x & 0xff000000) >> 24) \| ((x & 0x000000ff) << 24); +} +uint32 Reverse5 (uint32 x) { / does NOT produce Rev / + return ((f(x) & 0x0000ff00) <<8) \| ((f(x) & 0x00ff0000) >> 8) \| ((f(x) & 0xff000000) >> 24) \| ((f(x) & 0x000000ff) << 24); +} +unsigned int Reverse6 (unsigned int x) { + return ((x & 0x0000ff00) <<8) \| ((x & 0x0000ff00) >> 8) \| ((x & 0xff000000) >> 24) \| ((x & 0x000000ff) << 24); +} + +uint64 llReverse4 (volatile uint64 x) { + return ((x&0xFF00000000000000ull)>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000FF00000000ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| ((x&0x00000000000000FFull)<<56); +} +unsigned long long llReverse5 (unsigned long long x) { + return ((llf(x)&0xFF00000000000000ull)>>56) \| ((llf(x)&0x00FF000000000000ull)>>40) \| ((llf(x)&0x0000FF0000000000ull)>>24) \| ((llf(x)&0x000000FF00000000ull)>> 8) + \| ((llf(x)&0x00000000FF000000ull)<< 8) \| ((llf(x)&0x0000000000FF0000ull)<<24) \| ((llf(x)&0x000000000000FF00ull)<<40) \| ((llf(x)&0x00000000000000FFull)<<56); +} +uint64 llReverse6 (uint64 x) { + return ((x&0xFF00000000000000ull)>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000000000ff00ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| ((x&0x00000000000000FFull)<<56); +} +int main() { + unsigned int x = 0x12345678; + unsigned long long y = 0x123456789abcdef0ull; + if (Reverse4(x) != 0x78563412) + abort(); + if (Reverse5(x) != 0x78563412) + abort(); + if (count != 4) + abort(); + if (Reverse6(x) != 0x78560056) + abort(); + if (llReverse4(y) != 0xf0debc9a78563412ull) + abort(); + if (llReverse5(y) != 0xf0debc9a78563412ull) + abort(); + if (llcount != 8) + abort(); + if (llReverse6(y) != 0xf0debc9a005634deull) + abort(); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/bswap-5.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,69 @@ +/ APPLE LOCAL file bswap support / +/ These cases should NOT generate bswap. / +/ { dg-do compile } / +/ { dg-options "-O0 -std=gnu99" } / + +typedef unsigned int uint32; +typedef unsigned long long uint64; +extern void abort(void); +uint32 f (uint32) __attribute__((noinline)); +uint64 llf (uint64) __attribute__((noinline)); +unsigned int Reverse4 (volatile unsigned int) __attribute__((noinline)); +uint32 Reverse5 (uint32) __attribute__((noinline)); +unsigned int Reverse6 (unsigned int) __attribute__((noinline)); +uint64 llReverse4 (volatile uint64) __attribute__((noinline)); +unsigned long long llReverse5 (unsigned long long) __attribute__((noinline)); +uint64 llReverse6 (uint64) __attribute__((noinline)); + +static int count = 0; +static int llcount = 0; +uint32 f(uint32 x) { count++; return x; } +uint64 llf(uint64 x) { llcount++; return x; } + +unsigned int Reverse4 (volatile unsigned int x) { / does NOT produce Rev / + return ((x & 0x0000ff00) <<8) \| ((x & 0x00ff0000) >> 8) \| ((x & 0xff000000) >> 24) \| ((x & 0x000000ff) << 24); +} +uint32 Reverse5 (uint32 x) { / does NOT produce Rev / + return ((f(x) & 0x0000ff00) <<8) \| ((f(x) & 0x00ff0000) >> 8) \| ((f(x) & 0xff000000) >> 24) \| ((f(x) & 0x000000ff) << 24); +} +unsigned int Reverse6 (unsigned int x) { + return ((x & 0x0000ff00) <<8) \| ((x & 0x0000ff00) >> 8) \| ((x & 0xff000000) >> 24) \| ((x & 0x000000ff) << 24); +} + +uint64 llReverse4 (volatile uint64 x) { + return ((x&0xFF00000000000000ull)>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000FF00000000ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| ((x&0x00000000000000FFull)<<56); +} +unsigned long long llReverse5 (unsigned long long x) { + return ((llf(x)&0xFF00000000000000ull)>>56) \| ((llf(x)&0x00FF000000000000ull)>>40) \| ((llf(x)&0x0000FF0000000000ull)>>24) \| ((llf(x)&0x000000FF00000000ull)>> 8) + \| ((llf(x)&0x00000000FF000000ull)<< 8) \| ((llf(x)&0x0000000000FF0000ull)<<24) \| ((llf(x)&0x000000000000FF00ull)<<40) \| ((llf(x)&0x00000000000000FFull)<<56); +} +uint64 llReverse6 (uint64 x) { + return ((x&0xFF00000000000000ull)>>56) \| ((x&0x00FF000000000000ull)>>40) \| ((x&0x0000FF0000000000ull)>>24) \| ((x&0x000000000000ff00ull)>> 8) + \| ((x&0x00000000FF000000ull)<< 8) \| ((x&0x0000000000FF0000ull)<<24) \| ((x&0x000000000000FF00ull)<<40) \| ((x&0x00000000000000FFull)<<56); +} +int main() { + unsigned int x = 0x12345678; + unsigned long long y = 0x123456789abcdef0ull; + if (Reverse4(x) != 0x78563412) + abort(); + if (Reverse5(x) != 0x78563412) + abort(); + if (count != 4) + abort(); + if (Reverse6(x) != 0x78560056) + abort(); + if (llReverse4(y) != 0xf0debc9a78563412ull) + abort(); + if (llReverse5(y) != 0xf0debc9a78563412ull) + abort(); + if (llcount != 8) + abort(); + if (llReverse6(y) != 0xf0debc9a005634deull) + abort(); + return 0; +} + +/ { dg-final { if [ istarget arm--darwin* ] { scan-assembler-not "\\\trev" } } } / +/ { dg-final { if [ istarget i?86--darwin ] { scan-assembler-not "\\\tbswap" } } } / + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/condexec-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,33 @@ +/ APPLE LOCAL file ARM 5814138 / +/ Sequential if statements were being translated into conditionally- + executed instructions with an incorrect condition. / +/ { dg-do run } / +/ { dg-options "-O2" } / +int bug (int n1, int n2, int d1, int d2) +{ + int flag = 0, test, x, x1, x2; + + while (n1 != 0 && n2 != 0) + { + x1 = d1, x2 = d2; + test = x1 - x2; + if (test >= 0) + x = x2, d2++, n2--, flag ^= 2; + if (test <= 0) + x = x1, d1++, n1--, flag ^= 1; + if (flag == 3) + return 1; + } + + return 0; +} + +int arr1[5] = {1, 2, 3, 4, 5}; +int arr2[5] = {0, -1, -2, -3, -4}; +int arr3[5] = {7, 8, 9, 10, 11}; + +int main (void) +{ + return bug (5, 5, arr1, arr2) \|\| bug (5, 5, arr1, arr3); +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/const-cfstring-5.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,13 @@ +/ APPLE LOCAL file radar 6068877 / +/ Test that utf16 characters in a cfstring literal is supported in c, as well as + objc. / +/ { dg-options "-Werror" } / +/ { dg-do compile { target --darwin* } } / + +#import + +int main() +{ + CFSTR("h?? h?? h??"); +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,21 @@ +/ APPLE LOCAL file ARM 5683689 / + +/ Verify that the correct builtin definition is generated when + -miphoneos-version-min is given. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=1.3" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 10300) +#error TEST FAILS +#endif + +#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +#error TEST FAILS +#endif + +int main(void) +{ + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-2.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,21 @@ +/* APPLE LOCAL file ARM 5683689 / + +/ Verify that the correct builtin definition is generated when + -miphoneos-version-min is given. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=1.20" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 12000) +#error TEST FAILS +#endif + +#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +#error TEST FAILS +#endif + +int main(void) +{ + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-3.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,21 @@ +/* APPLE LOCAL file ARM 5683689 / + +/ Verify that the correct builtin definition is generated when + -miphoneos-version-min is given. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=1.2.3" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 10203) +#error TEST FAILS +#endif + +#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +#error TEST FAILS +#endif + +int main(void) +{ + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-4.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,21 @@ +/* APPLE LOCAL file ARM 5683689 / + +/ Verify that the correct builtin definition is generated when + -miphoneos-version-min is given. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=98.76.54" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 987654) +#error TEST FAILS +#endif + +#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +#error TEST FAILS +#endif + +int main(void) +{ + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,20 @@ +/* APPLE LOCAL file ARM 5683689 / + +/ Verify that the correct builtin definition is generated by default + when generating code for the ARM architecture. / + +/ { dg-do compile { target arm--darwin* } } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +#if (__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ != 20000) +#error TEST FAILS +#endif + +#ifdef __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +#error TEST FAILS +#endif + +int main(void) +{ + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-default-2.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/* APPLE LOCAL file ARM 5683689 / + +/ Verify that the correct builtin definition is generated by default + when generating code for the ARM architecture. / + +/ { dg-do compile { target powerpc--darwin* i?86--darwin } } / + +#ifdef __ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__ +#error TEST FAILS +#endif + +int main(void) +{ + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,14 @@ +/ APPLE LOCAL file ARM 5683689 / + +/ Verify that -miphoneos-version-min is not allowed in conjunction with + -mmacosx-version-min. / + +/ { dg-do compile { target --darwin* } } / +/ { dg-options "-miphoneos-version-min=1.2 -mmacosx-version-min=10.4" } / + +int main(void) +{ + return 0; +} + +/ { dg-error "-mmacosx-version-min not allowed with -miphoneos-version-min" "" {target --} 1 } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-2.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/* APPLE LOCAL file ARM 5683689 / + +/ Verify that an error message is given for an invalid + -miphoneos-version-min argument. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=1" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +int main(void) +{ + return 0; +} + +/* { dg-error "Unknown value '1' of -miphoneos-version-min" "" {target --* } 0 } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-3.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/ APPLE LOCAL file ARM 5683689 / + +/ Verify that an error message is given for an invalid + -miphoneos-version-min argument. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=foobar" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +int main(void) +{ + return 0; +} + +/* { dg-error "Unknown value 'foobar' of -miphoneos-version-min" "" {target --* } 0 } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-4.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/ APPLE LOCAL file ARM 5683689 / + +/ Verify that an error message is given for an invalid + -miphoneos-version-min argument. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=1.2." } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +int main(void) +{ + return 0; +} + +/* { dg-error "Unknown value '1.2.' of -miphoneos-version-min" "" {target --* } 0 } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-5.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/ APPLE LOCAL file ARM 5683689 / + +/ Verify that an error message is given for an invalid + -miphoneos-version-min argument. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=1.2.345" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +int main(void) +{ + return 0; +} + +/* { dg-error "Unknown value '1.2.345' of -miphoneos-version-min" "" {target --* } 0 } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-6.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/ APPLE LOCAL file ARM 5683689 / + +/ Verify that an error message is given for an invalid + -miphoneos-version-min argument. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=1.f" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +int main(void) +{ + return 0; +} + +/* { dg-error "Unknown value '1.f' of -miphoneos-version-min" "" {target --* } 0 } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-7.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/ APPLE LOCAL file ARM 5683689 / + +/ Verify that an error message is given for an invalid + -miphoneos-version-min argument. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=1.2.f" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +int main(void) +{ + return 0; +} + +/* { dg-error "Unknown value '1.2.f' of -miphoneos-version-min" "" {target --* } 0 } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/iphoneos-minversion-err-8.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/ APPLE LOCAL file ARM 5683689 / + +/ Verify that an error message is given for an invalid + -miphoneos-version-min argument. / + +/ { dg-do compile { target arm--darwin* i?86--darwin* } } / +/ { dg-options "-miphoneos-version-min=" } / +/ { dg-skip-if "Not valid with -mmacosx-version-min" { --darwin* } { "-mmacosx-version-min=" } { "" } } / + +int main(void) +{ + return 0; +} + +/* { dg-error "missing argument" "" {target --* } 0 } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-2.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,27 @@ +/ APPLE LOCAL file shorten-64-to-32 5909621 4604239 / +/ { dg-do compile } / +/ { dg-options "-Wshorten-64-to-32" } / +/ Radar 4604239 / + +#include + +double f; +int e; + +typedef double CFTimeInterval; +typedef CFTimeInterval CFAbsoluteTime; + +double foo(void) { return cos(0.); } + +int main(int argc, const char argv[]) +{ + CFAbsoluteTime absoluteTime = CFAbsoluteTimeGetCurrent(); + CFAbsoluteTime divisor = 2.0; + CFAbsoluteTime theRemainder = remainder(absoluteTime, divisor); + return 0; + + f = pow (f, f); + f = fma (f, f, f); + f = frexp ( f, &e); + f = remquo (f, f, &e); +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/shorten-3.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,15 @@ +/* APPLE LOCAL file shorten-64-to-32 5909621 / +/ { dg-do compile } / +/ { dg-options "-Wshorten-64-to-32" } / +/ Radar 5909621 / + +#include +#include + +long long int i; + +int main (int argc, const char argv[]) { + double value = 123.45; + i = llround(value); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/stack-protect-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,12 @@ +/* APPLE LOCAL file stack-protector default 5095227 / +/ { dg-do compile } / +/ Verify that -fstack-protector is on by default and that it at least + appears to work. / +extern void f2(char ); +void f1(void) +{ + char array[256]; + f2(array); +} +/* { dg-final { scan-assembler "__stack_chk_guard" } } / +/ { dg-final { scan-assembler "__stack_chk_fail" } } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/ucn-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,10 @@ +/ APPLE LOCAL file 5782111 / +/ Identifiers containing UCNs should be prefixed with an underscore, + like other symbols. / +/ { dg-do compile { target --darwin* } } / +/ { dg-options "-std=c99" } / + +int foobar\u00C0; + +/ { dg-final { scan-assembler "_foobar" } } / +/ { dg-final { scan-assembler-not "\[^_\]foobar" } } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/utf-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,7 @@ +???/ APPLE LOCAL file UTF-8 BOM 5774975 / +#include + +int main (int argc, const char argv[]) { + printf("Hello, World!\n"); + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,43 @@ +/* APPLE LOCAL file uxtb16 support / +/ { dg-do compile { target arm--darwin* } } / +/ { dg-options "-O2 -mno-thumb -march=armv6" } / +/ Each function here should produce uxtb16. / + +/ uxtb16 x + 2, 0 / +unsigned test1(unsigned x) { return x & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) \| ((x & 0x0000FF00) >> 8); } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) \| ((x >> 8) & 0x000000FF); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) \| ((x & 0x000000FF) << 16); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) \| ((x << 16) & 0x00FF0000); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) \| ((x & 0xFF000000) >> 24); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) \| ((x << 8) & 0x00FF0000); } + +/ { dg-final { scan-assembler-times "uxtb16" 9 } } / + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-2.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,64 @@ +/ APPLE LOCAL file uxtb16 support / +/ { dg-do run { target arm--darwin* } } / +/ { dg-options "-O2 -mno-thumb -march=armv6" } / +/ Make sure the uxtb16 sequences work. / + +/ uxtb16 x + 2, 0 / +unsigned test1(unsigned x) { return x & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) \| ((x & 0x0000FF00) >> 8); } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) \| ((x >> 8) & 0x000000FF); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) \| ((x & 0x000000FF) << 16); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) \| ((x << 16) & 0x00FF0000); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) \| ((x & 0xFF000000) >> 24); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) \| ((x << 8) & 0x00FF0000); } + +int main() { + if (test1(0x12345678u) != 0x00340078u) + return 1; + if (test2(0x12345678u) != 0x00120056u) + return 1; + if (test3(0x12345678u) != 0x00120056u) + return 1; + if (test4(0x12345678u) != 0x00120056u) + return 1; + if (test5(0x12345678u) != 0x00120056u) + return 1; + if (test6(0x12345678u) != 0x00780034u) + return 1; + if (test7(0x12345678u) != 0x00780034u) + return 1; + if (test8(0x12345678u) != 0x00560012u) + return 1; + if (test9(0x12345678u) != 0x00560012u) + return 1; + return 0; +} + + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-3.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,43 @@ +/ APPLE LOCAL file uxtb16 support / +/ { dg-do compile { target arm--darwin* } } / +/ { dg-options "-O2 -mthumb -march=armv6" } / +/ uxtb16 should not be generated with -mthumb. / + +/ uxtb16 x + 2, 0 / +unsigned test1(unsigned x) { return x & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) \| ((x & 0x0000FF00) >> 8); } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) \| ((x >> 8) & 0x000000FF); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) \| ((x & 0x000000FF) << 16); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) \| ((x << 16) & 0x00FF0000); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) \| ((x & 0xFF000000) >> 24); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) \| ((x << 8) & 0x00FF0000); } + +/ { dg-final { scan-assembler-not "uxtb16" } } / + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-4.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,43 @@ +/ APPLE LOCAL file uxtb16 support / +/ { dg-do compile { target arm--darwin* } } / +/ { dg-options "-O2 -mno-thumb -march=armv4t" } / +/ uxtb16 should not be generated with -march=armv4t. / + +/ uxtb16 x + 2, 0 / +unsigned test1(unsigned x) { return x & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) \| ((x & 0x0000FF00) >> 8); } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) \| ((x >> 8) & 0x000000FF); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) \| ((x & 0x000000FF) << 16); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) \| ((x << 16) & 0x00FF0000); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) \| ((x & 0xFF000000) >> 24); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) \| ((x << 8) & 0x00FF0000); } + +/ { dg-final { scan-assembler-not "uxtb16" } } / + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/uxtb16-5.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,65 @@ +/ APPLE LOCAL file uxtb16 support / +/ { dg-do run { target arm--darwin* } } / +/ { dg-options "-O0 -mno-thumb -march=armv6" } / +/ Make sure things work at -O0; some of these will produce + uxtb16, some will not. / + +/ uxtb16 x + 2, 0 / +unsigned test1(unsigned x) { return x & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test2(unsigned x) { return (x >> 8) & 0x00FF00FF; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test3(unsigned x) { return (x & 0xFF00FF00) >> 8; } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test4(unsigned x) { return ((x & 0xFF000000) >> 8) \| ((x & 0x0000FF00) >> 8); } + +/ uxtb16 x, ror #8 + 3, 1 / +unsigned test5(unsigned x) { return ((x >> 8) & 0x00FF0000) \| ((x >> 8) & 0x000000FF); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test6(unsigned x) { return ((x & 0x00FF0000) >> 16) \| ((x & 0x000000FF) << 16); } + +/ uxtb16 x, ror #16 + 0, 2 / +unsigned test7(unsigned x) { return ((x >> 16) & 0x000000FF) \| ((x << 16) & 0x00FF0000); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test8(unsigned x) { return ((x & 0x0000FF00) << 8) \| ((x & 0xFF000000) >> 24); } + +/ uxtb16 x, ror #24 + 1, 3 / +unsigned test9(unsigned x) { return ((x >> 24) & 0x000000FF) \| ((x << 8) & 0x00FF0000); } + +int main() { + if (test1(0x12345678u) != 0x00340078u) + return 1; + if (test2(0x12345678u) != 0x00120056u) + return 1; + if (test3(0x12345678u) != 0x00120056u) + return 1; + if (test4(0x12345678u) != 0x00120056u) + return 1; + if (test5(0x12345678u) != 0x00120056u) + return 1; + if (test6(0x12345678u) != 0x00780034u) + return 1; + if (test7(0x12345678u) != 0x00780034u) + return 1; + if (test8(0x12345678u) != 0x00560012u) + return 1; + if (test9(0x12345678u) != 0x00560012u) + return 1; + return 0; +} + + Added: llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c?rev=54499&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/visibility-1.c Thu Aug 7 20:03:11 2008 @@ -0,0 +1,16 @@ +/ APPLE LOCAL file ARM 6077274 / +/ { dg-do compile { target arm--darwin* } } / +/ { dg-options "-fvisibility=hidden" } / +/ { dg-final { scan-assembler "_bar\\\$non_lazy_ptr" } } / +void foo (void (fnptr) (void)); + +void bar (void) __attribute__((weak)); +void bar (void) +{ +} + +void baz (void) +{ + foo (bar); +} + From isanbard at gmail.com Thu Aug 7 20:04:03 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 01:04:03 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54500 - in /llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple: const-cfstring-5.C empty-destructor-stmt-seq.C kext-stackprotect-1.C kext-stackprotect-2.C omit-destructor-call-scope.C omit-destructor-call.C thunks1.C thunks2.C thunks3.C thunks4.C visibility-2.C visibility-3.C weak-1.C Message-ID: <200808080104.m7814460023135@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 20:04:03 2008 New Revision: 54500 URL: http://llvm.org/viewvc/llvm-project?rev=54500&view=rev Log: Add non-blocks tests. Blocks tests will come after a blocks support update. Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/const-cfstring-5.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/empty-destructor-stmt-seq.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-1.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-2.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks1.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks2.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks3.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks4.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-2.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-3.C llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/weak-1.C Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/const-cfstring-5.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/const-cfstring-5.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/const-cfstring-5.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/const-cfstring-5.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,12 @@ +/* APPLE LOCAL file radar 6068877 / +/ Test that utf16 characters in a cfstring literal is supported in c++, as well as + objc, objc++. / +/ { dg-options "-Werror" } / +/ { dg-do compile { target --darwin* } } / + +#import + +int main() +{ + CFSTR("h?? h?? h??"); +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/empty-destructor-stmt-seq.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/empty-destructor-stmt-seq.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/empty-destructor-stmt-seq.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/empty-destructor-stmt-seq.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,25 @@ +/ APPLE LOCAL file 5559195 / +// { dg-do run } + +// Verify that an empty statement list does not cause the destructor to be +// marked as trivial. + +int N = 1; + +class A { +public: + ~A () { + N = 0; + {} + } +}; + +class B : public A { +}; + +int +main () +{ + { B b; } + return N; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-1.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/kext-stackprotect-1.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-1.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-1.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,11 @@ +/ APPLE LOCAL file stack-protector default 5095227 / +/ { dg-do compile { target powerpc--darwin* } } / +/ { dg-options "-fapple-kext -mmacosx-version-min=10.6" } / +extern void f2(char ); +void f1(void) +{ + char array[256]; + f2(array); +} +/* { dg-final { scan-assembler-not "__stack_chk_guard" } } / +/ { dg-final { scan-assembler-not "__stack_chk_fail" } } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-2.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/kext-stackprotect-2.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-2.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/kext-stackprotect-2.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,11 @@ +/ APPLE LOCAL file stack-protector default 5095227 / +/ { dg-do compile { target i?86--darwin* } } / +/ { dg-options "-fapple-kext" } / +extern void f2(char ); +void f1(void) +{ + char array[256]; + f2(array); +} +/* { dg-final { scan-assembler-not "__stack_chk_guard" } } / +/ { dg-final { scan-assembler-not "__stack_chk_fail" } } / Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/omit-destructor-call-scope.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call-scope.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,36 @@ +/ APPLE LOCAL file 5559195 / +// { dg-do compile } +// { dg-final { scan-assembler-not "(\tcall\|\tbl)\[ \]__ZN6ClassAD1Ev" } } +// { dg-final { scan-assembler "(\tcall\|\tbl)\[ \]__ZN6ClassBD1Ev" } } + +// Verify that implicit calls to empty destructors are omitted and implicit +// calls to non-empty destructors are not omitted when instances fall out of +// scope. + +int n; + +class ClassA { +public: + // Empty destructor. Should not be called when ClassA instance falls out + // of scope. + ~ClassA() {} +}; + +class ClassB { +public: + // Non-empty destructor. Should be called when ClassB instance falls out + // of scope. + ~ClassB() { + n = 0; + } +}; + +int +main() { + n = 1; + { + ClassA a; // Destructor not called. + ClassB b; // Destructor called. + } + return n; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/omit-destructor-call.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/omit-destructor-call.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,19 @@ +/ APPLE LOCAL file 5559195 / +// { dg-do compile } +// { dg-final { scan-assembler-not "(\tcall\|\tbl)\[ \]__ZN6ClassAD2Ev" } } + +// Verify that implicit calls to empty destructors are omitted. + +class ClassA { +public: + ~ClassA() {} // Empty destructor. Should not be called by B's destructor. +}; + +class ClassB : public ClassA { +}; + +int +main() { + { ClassB b; } // Destructor called as b falls out of scope. + return 0; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks1.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/thunks1.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks1.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks1.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,31 @@ +/* APPLE LOCAL file 5920116 / +/ Test proper generation of weak virtual function thunks. / +/ { dg-do run } / + +int result = 101; + +struct Interface1 +{ + int if1_var; + virtual void Interface1Func(void) = 0; +}; + +struct Interface2 +{ + virtual void Interface2Func(void) = 0; +}; + +class Implementation : public Interface1, public Interface2 +{ + void Interface1Func(void) { result -= 1; } + void Interface2Func(void) { result -= 100; } +}; + +int main (void) +{ + Implementation o2 = new Implementation; + ((Interface1 ) o2)->Interface1Func(); + ((Interface2 ) o2)->Interface2Func(); + delete o2; + return result; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks2.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/thunks2.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks2.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks2.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,32 @@ +/* APPLE LOCAL file 5920116 / +/ Test proper generation of weak virtual function thunks. / +/ { dg-do run } / +/ { dg-options "-mdynamic-no-pic" } / + +int result = 101; + +struct Interface1 +{ + int if1_var; + virtual void Interface1Func(void) = 0; +}; + +struct Interface2 +{ + virtual void Interface2Func(void) = 0; +}; + +class Implementation : public Interface1, public Interface2 +{ + void Interface1Func(void) { result -= 1; } + void Interface2Func(void) { result -= 100; } +}; + +int main (void) +{ + Implementation o2 = new Implementation; + ((Interface1 ) o2)->Interface1Func(); + ((Interface2 ) o2)->Interface2Func(); + delete o2; + return result; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks3.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/thunks3.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks3.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks3.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,41 @@ +/* APPLE LOCAL file 5920116 / +/ Test proper generation of non-weak virtual function thunks. / +/ { dg-do run } / + +int result = 101; + +struct Interface1 +{ + int if1_var; + virtual void Interface1Func(void) = 0; +}; + +struct Interface2 +{ + virtual void Interface2Func(void) = 0; +}; + +class Implementation : public Interface1, public Interface2 +{ + void Interface1Func(void); + void Interface2Func(void); +}; + +void Implementation::Interface1Func(void) +{ + result -= 1; +} + +void Implementation::Interface2Func(void) +{ + result -= 100; +} + +int main (void) +{ + Implementation o2 = new Implementation; + ((Interface1 ) o2)->Interface1Func(); + ((Interface2 ) o2)->Interface2Func(); + delete o2; + return result; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks4.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/thunks4.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks4.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/thunks4.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,42 @@ +/* APPLE LOCAL file 5920116 / +/ Test proper generation of non-weak virtual function thunks. / +/ { dg-do run } / +/ { dg-options "-mdynamic-no-pic" } / + +int result = 101; + +struct Interface1 +{ + int if1_var; + virtual void Interface1Func(void) = 0; +}; + +struct Interface2 +{ + virtual void Interface2Func(void) = 0; +}; + +class Implementation : public Interface1, public Interface2 +{ + void Interface1Func(void); + void Interface2Func(void); +}; + +void Implementation::Interface1Func(void) +{ + result -= 1; +} + +void Implementation::Interface2Func(void) +{ + result -= 100; +} + +int main (void) +{ + Implementation o2 = new Implementation; + ((Interface1 ) o2)->Interface1Func(); + ((Interface2 ) o2)->Interface2Func(); + delete o2; + return result; +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-2.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/visibility-2.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-2.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-2.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,30 @@ +/* APPLE LOCAL file constrain visibility for templates 5813435 / +/ { dg-require-visibility "" } / +/ { dg-options "-fvisibility=hidden" } / + +/ { dg-final { scan-hidden "__ZN1s6vectorI1AEC1Ev" } } / +/ { dg-final { scan-hidden "__ZN1s3fooI1AEEvT_" } } / +/ Radar 5813435 / + +namespace s __attribute__((visibility("default"))) { + template + class vector { + public: + vector() { } + }; + template + void foo(T t) { + } +} + +class A { +public: + A() { } +}; + +s::vector v; + +int main() { + A a; + s::foo(a); +} Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-3.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/visibility-3.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-3.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/visibility-3.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,15 @@ +/ APPLE LOCAL file ARM 6062215 / +/ { dg-do compile { target arm--darwin* } } / +/ { dg-options "-fvisibility-inlines-hidden" } / +/ { dg-final { scan-assembler "__ZN8my_class2fnEv\\\$lazy_ptr" } } / + +struct my_class { + inline void fn (void) {} +}; + +void foo (void) +{ + my_class mci; + mci.fn (); +} + Added: llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/weak-1.C URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/testsuite/g%2B%2B.apple/weak-1.C?rev=54500&view=auto ============================================================================== --- llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/weak-1.C (added) +++ llvm-gcc-4.2/trunk/gcc/testsuite/g++.apple/weak-1.C Thu Aug 7 20:04:03 2008 @@ -0,0 +1,19 @@ +/ APPLE LOCAL file weak types 5954418 / +/ { dg-do compile } / +/ { dg-final { scan-assembler "weak_definition __ZTI1B" } } / +/ { dg-final { scan-assembler "weak_definition __ZTI1A" } } / +/ Radar 5954418 / + +#define WEAK __attribute__ ((weak)) + +class WEAK A { + virtual void foo(); +}; + +class B : public A { + virtual void foo(); +}; + +void A::foo() { } + +void B::foo() { } From dalej at apple.com Thu Aug 7 22:35:04 2008 From: dalej at apple.com (Dale Johannesen) Date: Fri, 08 Aug 2008 03:35:04 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54503 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200808080335.m783Z5W8028007@zion.cs.uiuc.edu> Author: johannes Date: Thu Aug 7 22:35:02 2008 New Revision: 54503 URL: http://llvm.org/viewvc/llvm-project?rev=54503&view=rev Log: Fix a case where an initializer must add explicit padding at the end of a struct (see commment). Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54503&r1=54502&r2=54503&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Thu Aug 7 22:35:02 2008 @@ -6708,7 +6708,7 @@ // Decode the field's value. Constant Val = Convert(elt_value); - + // If the field is a bitfield, it could be spread across multiple fields and // may start at some bit offset. if (isBitfield(Field)) { @@ -6717,7 +6717,7 @@ // If not, things are much simpler. unsigned int FieldNo = GetFieldIndex(Field); assert(FieldNo < ResultElts.size() && "Invalid struct field number!"); - + // Example: struct X { int A; char C[]; } x = { 4, "foo" }; assert((TYPE_SIZE(getDeclaredType(Field)) \|\| (FieldNo == ResultElts.size()-1 && @@ -6751,7 +6751,34 @@ ResultElts[i] = Constant::getNullValue(STy->getElementType(i)); } - return ConstantStruct::get(ResultElts, STy->isPacked()); + // The type we're going to build for the initializer is not necessarily the + // same as the type of the struct. In cases where there is a union field. + // it is possible for the size and/or alignment of the two structs to differ, + // in which case we need some explicit padding. + Constant retval = ConstantStruct::get(ResultElts, STy->isPacked()); + const Type NewSTy = retval->getType(); + + unsigned oldLLVMSize = getTargetData().getABITypeSize(STy); + unsigned oldLLVMAlign = getTargetData().getABITypeAlignment(STy); + oldLLVMSize = ((oldLLVMSize+oldLLVMAlign-1)/oldLLVMAlign)oldLLVMAlign; + + unsigned newLLVMSize = getTargetData().getABITypeSize(NewSTy); + unsigned newLLVMAlign = getTargetData().getABITypeAlignment(NewSTy); + newLLVMSize = ((newLLVMSize+newLLVMAlign-1)/newLLVMAlign)newLLVMAlign; + + // oldSize < newSize occurs legitimately when we don't know the size of + // the struct. + if (newLLVMSize < oldLLVMSize) { + const Type FillTy; + if (oldLLVMSize - newLLVMSize == 1) + FillTy = Type::Int8Ty; + else + FillTy = ArrayType::get(Type::Int8Ty, oldLLVMSize - newLLVMSize); + ResultElts.push_back(Constant::getNullValue(FillTy)); + retval = ConstantStruct::get(ResultElts, STy->isPacked()); + } + + return retval; } Constant TreeConstantToLLVM::ConvertUnionCONSTRUCTOR(tree exp) { From isanbard at gmail.com Thu Aug 7 22:36:19 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 03:36:19 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54504 - /llvm-gcc-4.2/trunk/gcc/limitx.h Message-ID: <200808080336.m783aKfo028051@zion.cs.uiuc.edu> Author: void Date: Thu Aug 7 22:36:19 2008 New Revision: 54504 URL: http://llvm.org/viewvc/llvm-project?rev=54504&view=rev Log: Linux systems have limits.h header files that don't work with the #include_next in the built limits.h header. This is a minor hack to prevent it from erroring out. Modified: llvm-gcc-4.2/trunk/gcc/limitx.h Modified: llvm-gcc-4.2/trunk/gcc/limitx.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/limitx.h?rev=54504&r1=54503&r2=54504&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/limitx.h (original) +++ llvm-gcc-4.2/trunk/gcc/limitx.h Thu Aug 7 22:36:19 2008 @@ -7,6 +7,8 @@ #include "syslimits.h" #endif #ifdef _GCC_NEXT_LIMITS_H +/* LLVM LOCAL Fix for Linux builds / +#define _GCC_LIMITS_H_ #include_next #undef _GCC_NEXT_LIMITS_H #endif From dalej at apple.com Thu Aug 7 22:37:11 2008 From: dalej at apple.com (Dale Johannesen) Date: Fri, 08 Aug 2008 03:37:11 -0000 Subject: [llvm-commits] [llvm] r54505 - in /llvm/trunk/test/FrontendC: 2008-08-07-AlignPadding1.c 2008-08-07-AlignPadding2.c Message-ID: <200808080337.m783bBAW028086@zion.cs.uiuc.edu> Author: johannes Date: Thu Aug 7 22:37:11 2008 New Revision: 54505 URL: http://llvm.org/viewvc/llvm-project?rev=54505&view=rev Log: Testcases for 54503. One derived from PR 2533, the other from Python. Added: llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c Added: llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c?rev=54505&view=auto ============================================================================== --- llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c (added) +++ llvm/trunk/test/FrontendC/2008-08-07-AlignPadding1.c Thu Aug 7 22:37:11 2008 @@ -0,0 +1,29 @@ +/ RUN: %llvmgcc %s -m64 -S -o - -emit-llvm -O0 \| grep zeroinitializer \| count 6 + +The FE must generate padding here both at the end of each PyG_Head and +between array elements. Reduced from Python. / + +typedef union _gc_head { + struct { + union _gc_head gc_next; + union _gc_head gc_prev; + long gc_refs; + } gc; + int dummy __attribute__((aligned(16))); +} PyGC_Head; + +struct gc_generation { + PyGC_Head head; + int threshold; + int count; +}; + +#define GEN_HEAD(n) (&generations[n].head) + +/ linked lists of container objects / +static struct gc_generation generations[3] = { + / PyGC_Head, threshold, count / + {{{GEN_HEAD(0), GEN_HEAD(0), 0}}, 700, 0}, + {{{GEN_HEAD(1), GEN_HEAD(1), 0}}, 10, 0}, + {{{GEN_HEAD(2), GEN_HEAD(2), 0}}, 10, 0}, +}; Added: llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c?rev=54505&view=auto ============================================================================== --- llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c (added) +++ llvm/trunk/test/FrontendC/2008-08-07-AlignPadding2.c Thu Aug 7 22:37:11 2008 @@ -0,0 +1,18 @@ +/ RUN: %llvmgcc %s -m64 -S -o - -emit-llvm -O0 \| grep zeroinitializer \| count 1 + +The FE must not generate padding here between array elements. PR 2533. / + +typedef struct { + const char name; + int flags; + union { + int x; + } u; +} OptionDef; + +const OptionDef options[] = { + /* main options / + { "a", 0, {3} }, + { "b", 0, {4} }, + { 0, }, +}; From bruno.cardoso at gmail.com Thu Aug 7 22:58:35 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 03:58:35 -0000 Subject: [llvm-commits] [llvm] r54506 - in /llvm/trunk/test/CodeGen/Mips: ./ 2008-06-05-Carry.ll 2008-07-03-SRet.ll 2008-07-05-ByVal.ll dg.exp Message-ID: <200808080358.m783wZ1c028756@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 22:58:34 2008 New Revision: 54506 URL: http://llvm.org/viewvc/llvm-project?rev=54506&view=rev Log: Batch 1 of Mips CodeGen tests, more coming... I had a lot of simple local codegen tests and they are now ready to be placed in test/CodeGen. Added: llvm/trunk/test/CodeGen/Mips/ llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll llvm/trunk/test/CodeGen/Mips/dg.exp Added: llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll?rev=54506&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-06-05-Carry.ll Thu Aug 7 22:58:34 2008 @@ -0,0 +1,19 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep subu %t \| count 2 +; RUN: grep addu %t \| count 4 + +target datalayout = +"e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define i64 @add64(i64 %u, i64 %v) nounwind { +entry: + %tmp2 = add i64 %u, %v + ret i64 %tmp2 +} + +define i64 @sub64(i64 %u, i64 %v) nounwind { +entry: + %tmp2 = sub i64 %u, %v + ret i64 %tmp2 +} Added: llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll?rev=54506&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-03-SRet.ll Thu Aug 7 22:58:34 2008 @@ -0,0 +1,18 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips \| \ +; RUN: grep {sw.(\$4)} \| count 3 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + %struct.sret0 = type { i32, i32, i32 } + +define void @test0(%struct.sret0* noalias sret %agg.result, i32 %dummy) nounwind { +entry: + getelementptr %struct.sret0* %agg.result, i32 0, i32 0 ; :0 [#uses=1] + store i32 %dummy, i32* %0, align 4 + getelementptr %struct.sret0* %agg.result, i32 0, i32 1 ; :1 [#uses=1] + store i32 %dummy, i32* %1, align 4 + getelementptr %struct.sret0* %agg.result, i32 0, i32 2 ; :2 [#uses=1] + store i32 %dummy, i32* %2, align 4 + ret void +} + Added: llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll?rev=54506&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-05-ByVal.ll Thu Aug 7 22:58:34 2008 @@ -0,0 +1,19 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips \| \ +; RUN: grep {lw.(\$4)} \| count 2 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + %struct.byval0 = type { i32, i32 } + +define i64 @test0(%struct.byval0 byval %b, i64 %sum) nounwind { +entry: + getelementptr %struct.byval0* %b, i32 0, i32 0 ; :0 [#uses=1] + load i32* %0, align 4 ; :1 [#uses=1] + getelementptr %struct.byval0* %b, i32 0, i32 1 ; :2 [#uses=1] + load i32* %2, align 4 ; :3 [#uses=1] + add i32 %3, %1 ; :4 [#uses=1] + sext i32 %4 to i64 ; :5 [#uses=1] + add i64 %5, %sum ; :6 [#uses=1] + ret i64 %6 +} + Added: llvm/trunk/test/CodeGen/Mips/dg.exp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/dg.exp?rev=54506&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/dg.exp (added) +++ llvm/trunk/test/CodeGen/Mips/dg.exp Thu Aug 7 22:58:34 2008 @@ -0,0 +1,5 @@ +load_lib llvm.exp + +if { [llvm_supports_target Mips] } { + RunLLVMTests [lsort [glob -nocomplain $srcdir/$subdir/.{ll,c,cpp}]] +} From bruno.cardoso at gmail.com Thu Aug 7 23:03:26 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 04:03:26 -0000 Subject: [llvm-commits] [llvm] r54507 - in /llvm/trunk/test/CodeGen/Mips: 2008-07-06-fadd64.ll 2008-07-07-FPExtend.ll 2008-07-07-Float2Int.ll Message-ID: <200808080403.m7843QVT028946@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 23:03:25 2008 New Revision: 54507 URL: http://llvm.org/viewvc/llvm-project?rev=54507&view=rev Log: Batch 2 of Mips CodeGen tests Added: llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll Added: llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll?rev=54507&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-06-fadd64.ll Thu Aug 7 23:03:25 2008 @@ -0,0 +1,11 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips \| \ +; RUN: grep __adddf3 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define double @dofloat(double %a, double %b) nounwind { +entry: + add double %a, %b ; :0 [#uses=1] + ret double %0 +} Added: llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll?rev=54507&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-07-FPExtend.ll Thu Aug 7 23:03:25 2008 @@ -0,0 +1,11 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips \| \ +; RUN: grep __extendsfdf2 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define double @dofloat(float %a) nounwind { +entry: + fpext float %a to double ; :0 [#uses=1] + ret double %0 +} Added: llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll?rev=54507&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-07-Float2Int.ll Thu Aug 7 23:03:25 2008 @@ -0,0 +1,17 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips \| \ +; RUN: grep trunc.w.s \| count 3 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define i32 @fptoint(float %a) nounwind { +entry: + fptosi float %a to i32 ; :0 [#uses=1] + ret i32 %0 +} + +define i32 @fptouint(float %a) nounwind { +entry: + fptoui float %a to i32 ; :0 [#uses=1] + ret i32 %0 +} From bruno.cardoso at gmail.com Thu Aug 7 23:05:51 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 04:05:51 -0000 Subject: [llvm-commits] [llvm] r54508 - in /llvm/trunk/test/CodeGen/Mips: 2008-07-07-IntDoubleConvertions.ll 2008-07-15-InternalConstant.ll 2008-07-15-SmallSection.ll Message-ID: <200808080405.m7845qei029046@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 23:05:51 2008 New Revision: 54508 URL: http://llvm.org/viewvc/llvm-project?rev=54508&view=rev Log: Batch 3 of Mips CodeGen tests Added: llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll Added: llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll?rev=54508&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-07-IntDoubleConvertions.ll Thu Aug 7 23:05:51 2008 @@ -0,0 +1,33 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep __floatsidf %t \| count 1 +; RUN: grep __floatunsidf %t \| count 1 +; RUN: grep __fixdfsi %t \| count 1 +; RUN: grep __fixunsdfsi %t \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define double @int2fp(i32 %a) nounwind { +entry: + sitofp i32 %a to double ; :0 [#uses=1] + ret double %0 +} + +define double @uint2double(i32 %a) nounwind { +entry: + uitofp i32 %a to double ; :0 [#uses=1] + ret double %0 +} + +define i32 @double2int(double %a) nounwind { +entry: + fptosi double %a to i32 ; :0 [#uses=1] + ret i32 %0 +} + +define i32 @double2uint(double %a) nounwind { +entry: + fptoui double %a to i32 ; :0 [#uses=1] + ret i32 %0 +} + Added: llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll?rev=54508&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-15-InternalConstant.ll Thu Aug 7 23:05:51 2008 @@ -0,0 +1,22 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep {rodata.str1.4,"aMS", at progbits} %t \| count 1 +; RUN: grep {r.data,} %t \| count 1 +; RUN: grep {\%hi} %t \| count 2 +; RUN: grep {\%lo} %t \| count 2 +; RUN: not grep {gp_rel} %t + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + at .str = internal constant [10 x i8] c"AAAAAAAAA\00" + at i0 = internal constant [5 x i32] [ i32 0, i32 1, i32 2, i32 3, i32 4 ] + +define i8 @foo() nounwind { +entry: + ret i8* getelementptr ([10 x i8]* @.str, i32 0, i32 0) +} + +define i32* @bar() nounwind { +entry: + ret i32* getelementptr ([5 x i32]* @i0, i32 0, i32 0) +} + Added: llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll?rev=54508&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-15-SmallSection.ll Thu Aug 7 23:05:51 2008 @@ -0,0 +1,32 @@ +; RUN: llvm-as < %s \| llc -mips-ssection-threshold=8 -march=mips -f -o %t0 +; RUN: llvm-as < %s \| llc -mips-ssection-threshold=0 -march=mips -f -o %t1 +; RUN: grep {sdata} %t0 \| count 1 +; RUN: grep {sbss} %t0 \| count 1 +; RUN: grep {gp_rel} %t0 \| count 2 +; RUN: not grep {sdata} %t1 +; RUN: not grep {sbss} %t1 +; RUN: not grep {gp_rel} %t1 +; RUN: grep {\%hi} %t1 \| count 2 +; RUN: grep {\%lo} %t1 \| count 2 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + + %struct.anon = type { i32, i32 } + at s0 = global [8 x i8] c"AAAAAAA\00", align 4 + at foo = global %struct.anon { i32 2, i32 3 } + at bar = global %struct.anon zeroinitializer + +define i8* @A0() nounwind { +entry: + ret i8* getelementptr ([8 x i8]* @s0, i32 0, i32 0) +} + +define i32 @A1() nounwind { +entry: + load i32* getelementptr (%struct.anon* @foo, i32 0, i32 0), align 8 + load i32* getelementptr (%struct.anon* @foo, i32 0, i32 1), align 4 + add i32 %1, %0 + ret i32 %2 +} + From bruno.cardoso at gmail.com Thu Aug 7 23:08:30 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 04:08:30 -0000 Subject: [llvm-commits] [llvm] r54509 - in /llvm/trunk/test/CodeGen/Mips: 2008-07-16-SignExtInReg.ll 2008-07-22-Cstpool.ll 2008-07-23-fpcmp.ll Message-ID: <200808080408.m7848UXJ029129@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 23:08:30 2008 New Revision: 54509 URL: http://llvm.org/viewvc/llvm-project?rev=54509&view=rev Log: Batch 4 of Mips CodeGen tests Added: llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll Added: llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll?rev=54509&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-16-SignExtInReg.ll Thu Aug 7 23:08:30 2008 @@ -0,0 +1,19 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep seh %t \| count 1 +; RUN: grep seb %t \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define i8 @A(i8 %e.0, i8 signext %sum) signext nounwind { +entry: + add i8 %sum, %e.0 ; :0 [#uses=1] + ret i8 %0 +} + +define i16 @B(i16 %e.0, i16 signext %sum) signext nounwind { +entry: + add i16 %sum, %e.0 ; :0 [#uses=1] + ret i16 %0 +} + Added: llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll?rev=54509&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-22-Cstpool.ll Thu Aug 7 23:08:30 2008 @@ -0,0 +1,12 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep {CPI\[01\]_\[01\]:} %t \| count 2 +; RUN: grep {rodata.cst4,"aM", at progbits} %t \| count 1 +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define float @F(float %a) nounwind { +entry: + add float %a, 0x4011333340000000 ; :0 [#uses=1] + add float %0, 0x4010666660000000 ; :1 [#uses=1] + ret float %1 +} Added: llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll?rev=54509&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-23-fpcmp.ll Thu Aug 7 23:08:30 2008 @@ -0,0 +1,34 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep {c\\..\\.s} %t \| count 3 +; RUN: grep {bc1\[tf\]} %t \| count 3 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define float @A(float %a, float %b) nounwind { +entry: + fcmp ogt float %a, 1.000000e+00 ; :0 [#uses=1] + br i1 %0, label %bb, label %bb2 + +bb: ; preds = %entry + add float %a, 1.000000e+00 ; :1 [#uses=1] + ret float %1 + +bb2: ; preds = %entry + ret float %b +} + +define float @B(float %a, float %b) nounwind { +entry: + fcmp ogt float %a, 1.000000e+00 ; :0 [#uses=1] + %.0 = select i1 %0, float %a, float %b ; [#uses=1] + ret float %.0 +} + +define i32 @C(i32 %a, i32 %b, float %j) nounwind { +entry: + fcmp ogt float %j, 1.000000e+00 ; :0 [#uses=1] + %.0 = select i1 %0, i32 %a, i32 %b ; [#uses=1] + ret i32 %.0 +} + From bruno.cardoso at gmail.com Thu Aug 7 23:09:57 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 04:09:57 -0000 Subject: [llvm-commits] [llvm] r54510 - in /llvm/trunk/test/CodeGen/Mips: 2008-07-29-icmp.ll 2008-07-31-fcopysign.ll 2008-08-01-AsmInline.ll Message-ID: <200808080409.m7849wM5029184@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 23:09:57 2008 New Revision: 54510 URL: http://llvm.org/viewvc/llvm-project?rev=54510&view=rev Log: Batch 5 of Mips CodeGen tests Added: llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll Added: llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll?rev=54510&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-29-icmp.ll Thu Aug 7 23:09:57 2008 @@ -0,0 +1,12 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips \| \ +; RUN: grep {b\[ne\]\[eq\]} \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define float @A(float %a, float %b, i32 %j) nounwind { +entry: + icmp sgt i32 %j, 1 ; :0 [#uses=1] + %.0 = select i1 %0, float %a, float %b ; [#uses=1] + ret float %.0 +} Added: llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll?rev=54510&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-07-31-fcopysign.ll Thu Aug 7 23:09:57 2008 @@ -0,0 +1,14 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep abs.s %t \| count 1 +; RUN: grep neg.s %t \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define float @A(float %i, float %j) nounwind { +entry: + tail call float @copysignf( float %i, float %j ) nounwind readnone ; :0 [#uses=1] + ret float %0 +} + +declare float @copysignf(float, float) nounwind readnone Added: llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll?rev=54510&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-08-01-AsmInline.ll Thu Aug 7 23:09:57 2008 @@ -0,0 +1,17 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep mfhi %t \| count 1 +; RUN: grep mflo %t \| count 1 +; RUN: grep multu %t \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + %struct.DWstruct = type { i32, i32 } + +define i32 @A0(i32 %u, i32 %v) nounwind { +entry: + %asmtmp = tail call %struct.DWstruct asm "multu $2,$3", "={lo},={hi},d,d"( i32 %u, i32 %v ) nounwind + %asmresult = extractvalue %struct.DWstruct %asmtmp, 0 + %asmresult1 = extractvalue %struct.DWstruct %asmtmp, 1 ; [#uses=1] + %res = add i32 %asmresult, %asmresult1 + ret i32 %res +} From bruno.cardoso at gmail.com Thu Aug 7 23:11:30 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 04:11:30 -0000 Subject: [llvm-commits] [llvm] r54511 - in /llvm/trunk/test/CodeGen/Mips: 2008-08-03-ReturnDouble.ll 2008-08-03-fabs64.ll 2008-08-04-Bitconvert.ll Message-ID: <200808080411.m784BV1f029243@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 23:11:30 2008 New Revision: 54511 URL: http://llvm.org/viewvc/llvm-project?rev=54511&view=rev Log: Batch 6 of Mips CodeGen tests Added: llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll Added: llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll?rev=54511&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-08-03-ReturnDouble.ll Thu Aug 7 23:11:30 2008 @@ -0,0 +1,18 @@ +; Double return in abicall (default) +; RUN: llvm-as < %s \| llc -march=mips +; PR2615 + +define double @main(...) { +entry: + %retval = alloca double ; [#uses=3] + store double 0.000000e+00, double %retval + %r = alloca double ; [#uses=1] + load double* %r ; :0 [#uses=1] + store double %0, double* %retval + br label %return + +return: ; preds = %entry + load double* %retval ; :1 [#uses=1] + ret double %1 +} + Added: llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll?rev=54511&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-08-03-fabs64.ll Thu Aug 7 23:11:30 2008 @@ -0,0 +1,16 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep {lui.32767} %t \| count 1 +; RUN: grep {ori.65535} %t \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define double @A(double %c, double %d) nounwind readnone { +entry: + tail call double @fabs( double %c ) nounwind readnone ; :0 [#uses=1] + tail call double @fabs( double %d ) nounwind readnone ; :0 [#uses=1] + add double %0, %1 + ret double %2 +} + +declare double @fabs(double) nounwind readnone Added: llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll?rev=54511&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-08-04-Bitconvert.ll Thu Aug 7 23:11:30 2008 @@ -0,0 +1,18 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips -f -o %t +; RUN: grep mtc1 %t \| count 1 +; RUN: grep mfc1 %t \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define float @A(i32 %u) nounwind { +entry: + bitcast i32 %u to float + ret float %0 +} + +define i32 @B(float %u) nounwind { +entry: + bitcast float %u to i32 + ret i32 %0 +} From bruno.cardoso at gmail.com Thu Aug 7 23:12:42 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 04:12:42 -0000 Subject: [llvm-commits] [llvm] r54512 - in /llvm/trunk/test/CodeGen/Mips: 2008-08-06-Alloca.ll 2008-08-07-CC.ll 2008-08-07-FPRound.ll Message-ID: <200808080412.m784CgVg029296@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 23:12:42 2008 New Revision: 54512 URL: http://llvm.org/viewvc/llvm-project?rev=54512&view=rev Log: [Last] Batch 7 of Mips CodeGen tests Added: llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll Added: llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll?rev=54512&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-08-06-Alloca.ll Thu Aug 7 23:12:42 2008 @@ -0,0 +1,17 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips \| \ +; RUN: grep {subu.sp} \| count 2 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define i32 @twoalloca(i32 %size) nounwind { +entry: + alloca i8, i32 %size ; :0 [#uses=1] + alloca i8, i32 %size ; :1 [#uses=1] + call i32 @foo( i8 %0 ) nounwind ; :2 [#uses=1] + call i32 @foo( i8* %1 ) nounwind ; :3 [#uses=1] + add i32 %3, %2 ; :4 [#uses=1] + ret i32 %4 +} + +declare i32 @foo(i8) Added: llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll?rev=54512&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-08-07-CC.ll Thu Aug 7 23:12:42 2008 @@ -0,0 +1,12 @@ +; RUN: llvm-as < %s \| llc -march=mips -f +; Mips must ignore fastcc + +target datalayout = +"e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define internal fastcc i32 @A(i32 %u) nounwind { +entry: + ret i32 %u +} + Added: llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll?rev=54512&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-08-07-FPRound.ll Thu Aug 7 23:12:42 2008 @@ -0,0 +1,11 @@ +; RUN: llvm-as < %s \| llc -enable-legalize-types -march=mips \| \ +; RUN: grep __truncdfsf2 \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define float @round2float(double %a) nounwind { +entry: + fptrunc double %a to float ; :0 [#uses=1] + ret float %0 +} From bruno.cardoso at gmail.com Thu Aug 7 23:49:43 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 04:49:43 -0000 Subject: [llvm-commits] [llvm] r54514 - /llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp Message-ID: <200808080449.m784nhJR030457@zion.cs.uiuc.edu> Author: bruno Date: Thu Aug 7 23:49:42 2008 New Revision: 54514 URL: http://llvm.org/viewvc/llvm-project?rev=54514&view=rev Log: Match raw "psp" triple target, as done by the homebrew toolchain. Modified: llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp Modified: llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp?rev=54514&r1=54513&r2=54514&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp Thu Aug 7 23:49:42 2008 @@ -50,7 +50,8 @@ // a allegrex target, set the features. We also match // big and little endian allegrex cores (dont really // know if a big one exists) - if (TT.find("mipsallegrex") != std::string::npos) { + if (TT.find("mipsallegrex") != std::string::npos \|\| + TT.find("psp") != std::string::npos) { MipsABI = EABI; IsSingleFloat = true; MipsArchVersion = Mips2; From sabre at nondot.org Fri Aug 8 00:33:06 2008 From: sabre at nondot.org (Chris Lattner) Date: Fri, 08 Aug 2008 05:33:06 -0000 Subject: [llvm-commits] [llvm] r54515 - in /llvm/trunk: include/llvm/PassAnalysisSupport.h include/llvm/PassManagers.h lib/VMCore/Pass.cpp lib/VMCore/PassManager.cpp Message-ID: <200808080533.m785X6hY031799@zion.cs.uiuc.edu> Author: lattner Date: Fri Aug 8 00:33:04 2008 New Revision: 54515 URL: http://llvm.org/viewvc/llvm-project?rev=54515&view=rev Log: Speed up the passmgr by avoiding heap thrashing on vectors. Modified: llvm/trunk/include/llvm/PassAnalysisSupport.h llvm/trunk/include/llvm/PassManagers.h llvm/trunk/lib/VMCore/Pass.cpp llvm/trunk/lib/VMCore/PassManager.cpp Modified: llvm/trunk/include/llvm/PassAnalysisSupport.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassAnalysisSupport.h?rev=54515&r1=54514&r2=54515&view=diff ============================================================================== --- llvm/trunk/include/llvm/PassAnalysisSupport.h (original) +++ llvm/trunk/include/llvm/PassAnalysisSupport.h Fri Aug 8 00:33:04 2008 @@ -20,6 +20,7 @@ #define LLVM_PASS_ANALYSIS_SUPPORT_H #include +#include "llvm/ADT/SmallVector.h" namespace llvm { @@ -34,9 +35,14 @@ // Pass infrastructure through the getAnalysisUsage virtual function. // class AnalysisUsage { +public: + typedef SmallVector VectorType; + +private: // Sets of analyses required and preserved by a pass - std::vector Required, RequiredTransitive, Preserved; + VectorType Required, RequiredTransitive, Preserved; bool PreservesAll; + public: AnalysisUsage() : PreservesAll(false) {} @@ -95,11 +101,11 @@ /// void setPreservesCFG(); - const std::vector &getRequiredSet() const { return Required; } - const std::vector &getRequiredTransitiveSet() const { + const VectorType &getRequiredSet() const { return Required; } + const VectorType &getRequiredTransitiveSet() const { return RequiredTransitive; } - const std::vector &getPreservedSet() const { return Preserved; } + const VectorType &getPreservedSet() const { return Preserved; } }; //===----------------------------------------------------------------------===// Modified: llvm/trunk/include/llvm/PassManagers.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassManagers.h?rev=54515&r1=54514&r2=54515&view=diff ============================================================================== --- llvm/trunk/include/llvm/PassManagers.h (original) +++ llvm/trunk/include/llvm/PassManagers.h Fri Aug 8 00:33:04 2008 @@ -309,7 +309,7 @@ void dumpPassInfo(Pass P, enum PassDebuggingString S1, enum PassDebuggingString S2, const char Msg); void dumpAnalysisSetInfo(const char Msg, Pass P, - const std::vector &Set) const; + const AnalysisUsage::VectorType &Set) const; virtual unsigned getNumContainedPasses() const { return (unsigned)PassVector.size(); Modified: llvm/trunk/lib/VMCore/Pass.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Pass.cpp?rev=54515&r1=54514&r2=54515&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Pass.cpp (original) +++ llvm/trunk/lib/VMCore/Pass.cpp Fri Aug 8 00:33:04 2008 @@ -294,8 +294,9 @@ namespace { struct GetCFGOnlyPasses : public PassRegistrationListener { - std::vector &CFGOnlyList; - GetCFGOnlyPasses(std::vector &L) : CFGOnlyList(L) {} + typedef AnalysisUsage::VectorType VectorType; + VectorType &CFGOnlyList; + GetCFGOnlyPasses(VectorType &L) : CFGOnlyList(L) {} void passEnumerate(const PassInfo P) { if (P->isCFGOnlyPass()) Modified: llvm/trunk/lib/VMCore/PassManager.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/PassManager.cpp?rev=54515&r1=54514&r2=54515&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/PassManager.cpp (original) +++ llvm/trunk/lib/VMCore/PassManager.cpp Fri Aug 8 00:33:04 2008 @@ -441,8 +441,8 @@ AnalysisUsage AnUsage; P->getAnalysisUsage(AnUsage); - const std::vector &RequiredSet = AnUsage.getRequiredSet(); - for (std::vector::const_iterator I = RequiredSet.begin(), + const AnalysisUsage::VectorType &RequiredSet = AnUsage.getRequiredSet(); + for (AnalysisUsage::VectorType::const_iterator I = RequiredSet.begin(), E = RequiredSet.end(); I != E; ++I) { Pass AnalysisPass = findAnalysisPass(I); @@ -584,7 +584,7 @@ if (AnUsage.getPreservesAll()) return true; - const std::vector &PreservedSet = AnUsage.getPreservedSet(); + const AnalysisUsage::VectorType &PreservedSet = AnUsage.getPreservedSet(); for (std::vector::iterator I = HigherLevelAnalysis.begin(), E = HigherLevelAnalysis.end(); I != E; ++I) { Pass P1 = I; @@ -606,10 +606,10 @@ #endif AnalysisUsage AnUsage; P->getAnalysisUsage(AnUsage); - const std::vector &PreservedSet = AnUsage.getPreservedSet(); + const AnalysisUsage::VectorType &PreservedSet = AnUsage.getPreservedSet(); // Verify preserved analysis - for (std::vector::const_iterator I = PreservedSet.begin(), + for (AnalysisUsage::VectorType::const_iterator I = PreservedSet.begin(), E = PreservedSet.end(); I != E; ++I) { AnalysisID AID = I; if (Pass AP = findAnalysisPass(AID, true)) @@ -664,7 +664,7 @@ if (AnUsage.getPreservesAll()) return; - const std::vector &PreservedSet = AnUsage.getPreservedSet(); + const AnalysisUsage::VectorType &PreservedSet = AnUsage.getPreservedSet(); for (std::map::iterator I = AvailableAnalysis.begin(), E = AvailableAnalysis.end(); I != E; ) { std::map::iterator Info = I++; @@ -822,8 +822,8 @@ Pass P) { AnalysisUsage AnUsage; P->getAnalysisUsage(AnUsage); - const std::vector &RequiredSet = AnUsage.getRequiredSet(); - for (std::vector::const_iterator + const AnalysisUsage::VectorType &RequiredSet = AnUsage.getRequiredSet(); + for (AnalysisUsage::VectorType::const_iterator I = RequiredSet.begin(), E = RequiredSet.end(); I != E; ++I) { AnalysisID AID = I; @@ -833,8 +833,8 @@ RP_NotAvail.push_back(AID); } - const std::vector &IDs = AnUsage.getRequiredTransitiveSet(); - for (std::vector::const_iterator I = IDs.begin(), + const AnalysisUsage::VectorType &IDs = AnUsage.getRequiredTransitiveSet(); + for (AnalysisUsage::VectorType::const_iterator I = IDs.begin(), E = IDs.end(); I != E; ++I) { AnalysisID AID = I; if (Pass AnalysisPass = findAnalysisPass(I, true)) @@ -853,7 +853,7 @@ AnalysisUsage AnUsage; P->getAnalysisUsage(AnUsage); - for (std::vector::const_iterator + for (AnalysisUsage::VectorType::const_iterator I = AnUsage.getRequiredSet().begin(), E = AnUsage.getRequiredSet().end(); I != E; ++I) { Pass Impl = findAnalysisPass(I, true); @@ -955,7 +955,7 @@ } void PMDataManager::dumpAnalysisSetInfo(const char Msg, Pass P, - const std::vector &Set) + const AnalysisUsage::VectorType &Set) const { if (PassDebugging >= Details && !Set.empty()) { cerr << (void)P << std::string(getDepth()2+3, ' ') << Msg << " Analyses:"; From bruno.cardoso at gmail.com Fri Aug 8 01:16:31 2008 From: bruno.cardoso at gmail.com (Bruno Cardoso Lopes) Date: Fri, 08 Aug 2008 06:16:31 -0000 Subject: [llvm-commits] [llvm] r54516 - in /llvm/trunk: lib/Target/Mips/MipsISelLowering.cpp lib/Target/Mips/MipsInstrInfo.td lib/Target/Mips/MipsSubtarget.cpp test/CodeGen/Mips/2008-08-08-ctlz.ll Message-ID: <200808080616.m786GWd7000802@zion.cs.uiuc.edu> Author: bruno Date: Fri Aug 8 01:16:31 2008 New Revision: 54516 URL: http://llvm.org/viewvc/llvm-project?rev=54516&view=rev Log: Support added for ctlz intrinsic, test case added. Added: llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp llvm/trunk/lib/Target/Mips/MipsInstrInfo.td llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp Modified: llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp?rev=54516&r1=54515&r2=54516&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsISelLowering.cpp Fri Aug 8 01:16:31 2008 @@ -119,7 +119,6 @@ setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i1, Expand); setOperationAction(ISD::CTPOP, MVT::i32, Expand); setOperationAction(ISD::CTTZ, MVT::i32, Expand); - setOperationAction(ISD::CTLZ, MVT::i32, Expand); setOperationAction(ISD::ROTL, MVT::i32, Expand); setOperationAction(ISD::ROTR, MVT::i32, Expand); setOperationAction(ISD::BSWAP, MVT::i32, Expand); @@ -147,6 +146,9 @@ setOperationAction(ISD::SIGN_EXTEND_INREG, MVT::i16, Expand); } + if (!Subtarget->hasBitCount()) + setOperationAction(ISD::CTLZ, MVT::i32, Expand); + setStackPointerRegisterToSaveRestore(Mips::SP); computeRegisterProperties(); } Modified: llvm/trunk/lib/Target/Mips/MipsInstrInfo.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsInstrInfo.td?rev=54516&r1=54515&r2=54516&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsInstrInfo.td (original) +++ llvm/trunk/lib/Target/Mips/MipsInstrInfo.td Fri Aug 8 01:16:31 2008 @@ -51,7 +51,8 @@ //===----------------------------------------------------------------------===// // Mips Instruction Predicate Definitions. //===----------------------------------------------------------------------===// -def HasSEInReg : Predicate<"Subtarget.hasSEInReg()">; +def HasSEInReg : Predicate<"Subtarget.hasSEInReg()">; +def HasBitCount : Predicate<"Subtarget.hasBitCount()">; //===----------------------------------------------------------------------===// // Mips Operand, Complex Patterns and Transformations Definitions. @@ -332,15 +333,6 @@ !strconcat(instr_asm, "\t$src"), [], IIHiLo>; -// Count Leading Ones/Zeros in Word -class CountLeading func, string instr_asm>: - FR< 0x1c, - func, - (outs CPURegs:$dst), - (ins CPURegs:$src), - !strconcat(instr_asm, "\t$dst, $src"), - [], IIAlu>; - class EffectiveAddress : FI<0x09, (outs CPURegs:$dst), @@ -348,6 +340,13 @@ instr_asm, [(set CPURegs:$dst, addr:$addr)], IIAlu>; +// Count Leading Ones/Zeros in Word +class CountLeading func, string instr_asm, SDNode CountOp>: + FR< 0x1c, func, (outs CPURegs:$dst), (ins CPURegs:$src), + !strconcat(instr_asm, "\t$dst, $src"), + [(set CPURegs:$dst, (CountOp CPURegs:$src))], IIAlu>; + +// Sign Extend in Register. class SignExtInReg func, string instr_asm, ValueType vt>: FR< 0x3f, func, (outs CPURegs:$dst), (ins CPURegs:$src), !strconcat(instr_asm, "\t$dst, $src"), @@ -494,6 +493,12 @@ def SEH : SignExtInReg<0x20, "seh", i16>; } +/// Count Leading +let Predicates = [HasBitCount] in { + def CLZ : CountLeading<0b010110, "clz", ctlz>; +//def CLO : CountLeading<0b010110, "clo">; +} + /// No operation let addr=0 in def NOP : FJ<0, (outs), (ins), "nop", [], IIAlu>; @@ -504,13 +509,6 @@ // can be matched. It's similar to Sparc LEA_ADDRi def LEA_ADDiu : EffectiveAddress<"addiu\t$dst, ${addr:stackloc}">; -// Count Leading -// CLO/CLZ are part of the newer MIPS32(tm) instruction -// set and not older Mips I keep this for future use -// though. -//def CLO : CountLeading<0x21, "clo">; -//def CLZ : CountLeading<0x20, "clz">; - // MADD/MSUB* are not part of MipsI either. //def MADD : MArithR<0x00, "madd">; //def MADDU : MArithR<0x01, "maddu">; Modified: llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp?rev=54516&r1=54515&r2=54516&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsSubtarget.cpp Fri Aug 8 01:16:31 2008 @@ -57,6 +57,7 @@ MipsArchVersion = Mips2; HasVFPU = true; // Enables Allegrex Vector FPU (not supported yet) HasSEInReg = true; + HasBitCount = true; } // Abicall is the default for O32 ABI and is ignored Added: llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll?rev=54516&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll (added) +++ llvm/trunk/test/CodeGen/Mips/2008-08-08-ctlz.ll Fri Aug 8 01:16:31 2008 @@ -0,0 +1,12 @@ +; RUN: llvm-as < %s \| llc -march=mips \| grep clz \| count 1 + +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:32-i16:16:32-i32:32:32-i64:32:64-f32:32:32-f64:64:64-v64:64:64-v128:128:128-a0:0:64" +target triple = "mipsallegrexel-psp-elf" + +define i32 @A0(i32 %u) nounwind { +entry: + call i32 @llvm.ctlz.i32( i32 %u ) + ret i32 %0 +} + +declare i32 @llvm.ctlz.i32(i32) nounwind readnone From nicholas at mxc.ca Fri Aug 8 01:34:07 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Fri, 08 Aug 2008 06:34:07 -0000 Subject: [llvm-commits] [llvm] r54517 - in /llvm/trunk: lib/CodeGen/AsmPrinter.cpp test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll Message-ID: <200808080634.m786Y7en001477@zion.cs.uiuc.edu> Author: nicholas Date: Fri Aug 8 01:34:07 2008 New Revision: 54517 URL: http://llvm.org/viewvc/llvm-project?rev=54517&view=rev Log: Don't crash printing the asm for a ConstantExpr PtrToInt just because the int is narrower than the pointer. This testcase emits: .byte (((17) - 16) & 255) Added: llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll Modified: llvm/trunk/lib/CodeGen/AsmPrinter.cpp Modified: llvm/trunk/lib/CodeGen/AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter.cpp?rev=54517&r1=54516&r2=54517&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter.cpp Fri Aug 8 01:34:07 2008 @@ -821,12 +821,13 @@ // We can emit the pointer value into this slot if the slot is an // integer slot greater or equal to the size of the pointer. - if (Ty->isInteger() && - TD->getABITypeSize(Ty) >= TD->getABITypeSize(Op->getType())) + if (TD->getABITypeSize(Ty) >= TD->getABITypeSize(Op->getType())) return EmitConstantValueOnly(Op); - - assert(0 && "FIXME: Don't yet support this kind of constant cast expr"); + + O << "(("; EmitConstantValueOnly(Op); + APInt ptrMask = APInt::getAllOnesValue(TD->getABITypeSizeInBits(Ty)); + O << ") & " << ptrMask.toStringUnsigned() << ')'; break; } case Instruction::Add: Added: llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll?rev=54517&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll (added) +++ llvm/trunk/test/CodeGen/Generic/2008-08-07-PtrToInt-SmallerInt.ll Fri Aug 8 01:34:07 2008 @@ -0,0 +1,7 @@ +; RUN: llvm-as < %s \| llc +; PR2603 +target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32" +target triple = "i386-pc-linux-gnu" + %struct.A = type { i8 } + %struct.B = type { i8, [1 x i8] } + at Foo = constant %struct.A { i8 ptrtoint (i8* getelementptr ([1 x i8]* inttoptr (i32 17 to [1 x i8]), i32 0, i32 -16) to i8) } ; <%struct.A> [#uses=0] From evan.cheng at apple.com Fri Aug 8 01:43:59 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 08 Aug 2008 06:43:59 -0000 Subject: [llvm-commits] [llvm] r54518 - /llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Message-ID: <200808080643.m786hxgR002097@zion.cs.uiuc.edu> Author: evancheng Date: Fri Aug 8 01:43:59 2008 New Revision: 54518 URL: http://llvm.org/viewvc/llvm-project?rev=54518&view=rev Log: Fix indentation. Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp?rev=54518&r1=54517&r2=54518&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Fri Aug 8 01:43:59 2008 @@ -839,9 +839,9 @@ } switch (GVar->getLinkage()) { - case GlobalValue::CommonLinkage: - case GlobalValue::LinkOnceLinkage: - case GlobalValue::WeakLinkage: + case GlobalValue::CommonLinkage: + case GlobalValue::LinkOnceLinkage: + case GlobalValue::WeakLinkage: if (Subtarget->isTargetDarwin()) { O << "\t.globl " << name << '\n' << TAI->getWeakDefDirective() << name << '\n'; @@ -852,17 +852,17 @@ O << "\t.weak\t" << name << '\n'; } break; - case GlobalValue::DLLExportLinkage: - case GlobalValue::AppendingLinkage: + case GlobalValue::DLLExportLinkage: + case GlobalValue::AppendingLinkage: // FIXME: appending linkage variables should go into a section of // their name or something. For now, just emit them as external. - case GlobalValue::ExternalLinkage: + case GlobalValue::ExternalLinkage: // If external or appending, declare as a global symbol O << "\t.globl " << name << '\n'; // FALL THROUGH - case GlobalValue::InternalLinkage: + case GlobalValue::InternalLinkage: break; - default: + default: assert(0 && "Unknown linkage type!"); } From evan.cheng at apple.com Fri Aug 8 01:56:16 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 08 Aug 2008 06:56:16 -0000 Subject: [llvm-commits] [llvm] r54519 - in /llvm/trunk: include/llvm/Target/DarwinTargetAsmInfo.h include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/DarwinTargetAsmInfo.cpp lib/Target/ELFTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll Message-ID: <200808080656.m786uHPq002844@zion.cs.uiuc.edu> Author: evancheng Date: Fri Aug 8 01:56:16 2008 New Revision: 54519 URL: http://llvm.org/viewvc/llvm-project?rev=54519&view=rev Log: It's not legal to output a GV in a coalesced section if it's used in an ARM PIC relative constantpool. Added: llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h llvm/trunk/include/llvm/Target/TargetAsmInfo.h llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h llvm/trunk/lib/Target/TargetAsmInfo.cpp Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Fri Aug 8 01:56:16 2008 @@ -30,7 +30,8 @@ const Section* DataCoalSection; explicit DarwinTargetAsmInfo(const TargetMachine &TM); - virtual const Section* SelectSectionForGlobal(const GlobalValue GV) const; + virtual const Section SelectSectionForGlobal(const GlobalValue GV, + bool NoCoalesce = false) const; virtual std::string UniqueSectionForGlobal(const GlobalValue GV, SectionKind::Kind kind) const; const Section* MergeableConstSection(const GlobalVariable GV) const; Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h Fri Aug 8 01:56:16 2008 @@ -26,7 +26,8 @@ struct ELFTargetAsmInfo: public virtual TargetAsmInfo { explicit ELFTargetAsmInfo(const TargetMachine &TM); - virtual const Section SelectSectionForGlobal(const GlobalValue GV) const; + virtual const Section SelectSectionForGlobal(const GlobalValue GV, + bool NoCoalesce = false) const; virtual std::string PrintSectionFlags(unsigned flags) const; const Section MergeableConstSection(const GlobalVariable GV) const; inline const Section MergeableConstSection(const Type Ty) const; Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Fri Aug 8 01:56:16 2008 @@ -544,8 +544,10 @@ const char name = NULL) const; /// SectionForGlobal - This hooks returns proper section name for given - /// global with all necessary flags and marks. - virtual std::string SectionForGlobal(const GlobalValue GV) const; + /// global with all necessary flags and marks. If NoCoalesce is true, + /// do not use coalesced section. + virtual std::string SectionForGlobal(const GlobalValue GV, + bool NoCoalesce = false) const; // Helper methods for SectionForGlobal virtual std::string UniqueSectionForGlobal(const GlobalValue* GV, @@ -553,7 +555,8 @@ virtual std::string PrintSectionFlags(unsigned flags) const { return ""; } - virtual const Section* SelectSectionForGlobal(const GlobalValue GV) const; + virtual const Section SelectSectionForGlobal(const GlobalValue GV, + bool NoCoalesce = false) const; virtual const Section SelectSectionForMachineConst(const Type Ty) const; Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Fri Aug 8 01:56:16 2008 @@ -29,6 +29,7 @@ #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" +#include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/Statistic.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/Compiler.h" @@ -65,14 +66,18 @@ typedef std::map ValueMapTy; ValueMapTy NumberForBB; - /// Keeps the set of GlobalValues that require non-lazy-pointers for - /// indirect access. + /// GVNonLazyPtrs - Keeps the set of GlobalValues that require + /// non-lazy-pointers for indirect access. std::set GVNonLazyPtrs; - /// Keeps the set of external function GlobalAddresses that the asm - /// printer should generate stubs for. + /// FnStubs - Keeps the set of external function GlobalAddresses that the + /// asm printer should generate stubs for. std::set FnStubs; + /// PCRelGVs - Keeps the set of GlobalValues used in pc relative + /// constantpool. + SmallPtrSet PCRelGVs; + /// True if asm printer is printing a series of CONSTPOOL_ENTRY. bool InCPMode; @@ -124,10 +129,12 @@ /// specified function body into. virtual std::string getSectionForFunction(const Function &F) const; + /// EmitMachineConstantPoolValue - Print a machine constantpool value to + /// the .s file. virtual void EmitMachineConstantPoolValue(MachineConstantPoolValue MCPV) { printDataDirective(MCPV->getType()); - ARMConstantPoolValue ACPV = (ARMConstantPoolValue)MCPV; + ARMConstantPoolValue ACPV = static_cast(MCPV); GlobalValue GV = ACPV->getGV(); std::string Name = GV ? Mang->getValueName(GV) : TAI->getGlobalPrefix(); if (!GV) @@ -680,9 +687,15 @@ const MachineConstantPoolEntry &MCPE = // Chasing pointers is fun? MI->getParent()->getParent()->getConstantPool()->getConstants()[CPI]; - if (MCPE.isMachineConstantPoolEntry()) + if (MCPE.isMachineConstantPoolEntry()) { EmitMachineConstantPoolValue(MCPE.Val.MachineCPVal); - else { + ARMConstantPoolValue ACPV = + static_cast(MCPE.Val.MachineCPVal); + if (ACPV->getPCAdjustment() != 0) { + const GlobalValue GV = ACPV->getGV(); + PCRelGVs.insert(GV); + } + } else { EmitGlobalConstant(MCPE.Val.ConstVal); // remember to emit the weak reference if (const GlobalValue GV = dyn_cast(MCPE.Val.ConstVal)) @@ -850,7 +863,8 @@ return; } - std::string SectionName = TAI->SectionForGlobal(GVar); + bool NoCoalesc = PCRelGVs.count(GVar); + std::string SectionName = TAI->SectionForGlobal(GVar, NoCoalesc); std::string name = Mang->getValueName(GVar); Constant C = GVar->getInitializer(); const Type Type = C->getType(); @@ -887,7 +901,7 @@ if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. if (TAI->getLCOMMDirective() != NULL) { - if (GVar->hasInternalLinkage()) { + if (NoCoalesc \|\| GVar->hasInternalLinkage()) { O << TAI->getLCOMMDirective() << name << "," << Size; if (Subtarget->isTargetDarwin()) O << "," << Align; Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Fri Aug 8 01:56:16 2008 @@ -51,14 +51,15 @@ } const Section -DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV) const { +DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV, + bool NoCoalesce) const { SectionKind::Kind Kind = SectionKindForGlobal(GV); - bool isWeak = GV->isWeakForLinker(); + bool CanCoalesce = !NoCoalesce && GV->isWeakForLinker(); bool isNonStatic = (DTM->getRelocationModel() != Reloc::Static); switch (Kind) { case SectionKind::Text: - if (isWeak) + if (CanCoalesce) return TextCoalSection; else return getTextSection_(); @@ -67,18 +68,18 @@ case SectionKind::BSS: case SectionKind::ThreadBSS: if (cast(GV)->isConstant()) - return (isWeak ? ConstDataCoalSection : ConstDataSection); + return (CanCoalesce ? ConstDataCoalSection : ConstDataSection); else - return (isWeak ? DataCoalSection : getDataSection_()); + return (CanCoalesce ? DataCoalSection : getDataSection_()); case SectionKind::ROData: - return (isWeak ? ConstDataCoalSection : + return (CanCoalesce ? ConstDataCoalSection : (isNonStatic ? ConstDataSection : getReadOnlySection_())); case SectionKind::RODataMergeStr: - return (isWeak ? + return (CanCoalesce ? ConstDataCoalSection : MergeableStringSection(cast(GV))); case SectionKind::RODataMergeConst: - return (isWeak ? + return (CanCoalesce ? ConstDataCoalSection: MergeableConstSection(cast(GV))); default: Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Fri Aug 8 01:56:16 2008 @@ -40,7 +40,8 @@ } const Section* -ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV) const { +ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV, + bool NoCoalesce) const { SectionKind::Kind Kind = SectionKindForGlobal(GV); if (const Function F = dyn_cast(GV)) { Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp Fri Aug 8 01:56:16 2008 @@ -82,7 +82,7 @@ } const Section MipsTargetAsmInfo:: -SelectSectionForGlobal(const GlobalValue GV) const { +SelectSectionForGlobal(const GlobalValue GV, bool NoCoalesce) const { SectionKind::Kind K = SectionKindForGlobal(GV); const GlobalVariable GVA = dyn_cast(GV); Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h (original) +++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h Fri Aug 8 01:56:16 2008 @@ -40,7 +40,8 @@ SectionFlagsForGlobal(const GlobalValue GV = NULL, const char* name = NULL) const; - virtual const Section* SelectSectionForGlobal(const GlobalValue GV) const; + virtual const Section SelectSectionForGlobal(const GlobalValue GV, + bool NoCoalesce) const; private: const MipsSubtarget Subtarget; Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=54519&r1=54518&r2=54519&view=diff ============================================================================== --- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Fri Aug 8 01:56:16 2008 @@ -272,7 +272,7 @@ } std::string -TargetAsmInfo::SectionForGlobal(const GlobalValue GV) const { +TargetAsmInfo::SectionForGlobal(const GlobalValue GV, bool NoCoalesce) const { const Section* S; // Select section name if (GV->hasSection()) { @@ -282,7 +282,7 @@ S = getNamedSection(GV->getSection().c_str(), Flags); } else { // Use default section depending on the 'type' of global - S = SelectSectionForGlobal(GV); + S = SelectSectionForGlobal(GV, NoCoalesce); } if (!S->isNamed()) @@ -295,8 +295,8 @@ } // Lame default implementation. Calculate the section name for global. -const Section* -TargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV) const { +const Section TargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV, + bool NoCoalesce) const { SectionKind::Kind Kind = SectionKindForGlobal(GV); if (GV->isWeakForLinker()) { Added: llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll?rev=54519&view=auto ============================================================================== --- llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll (added) +++ llvm/trunk/test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll Fri Aug 8 01:56:16 2008 @@ -0,0 +1,13 @@ +; RUN: llvm-as < %s \| llc -mtriple=arm-apple-darwin -mattr=+v6 -relocation-model=pic \| grep lcomm + + %struct.FILE = type { i8, i32, i32, i16, i16, %struct.__sbuf, i32, i8, i32 (i8), i32 (i8, i8, i32), i64 (i8, i64, i32), i32 (i8, i8, i32), %struct.__sbuf, %struct.__sFILEX, i32, [3 x i8], [1 x i8], %struct.__sbuf, i32, i64 } + %struct.__gcov_var = type { %struct.FILE, i32, i32, i32, i32, i32, i32, [1025 x i32] } + %struct.__sFILEX = type opaque + %struct.__sbuf = type { i8, i32 } + at __gcov_var = common global %struct.__gcov_var zeroinitializer ; <%struct.__gcov_var> [#uses=1] + +define i32 @__gcov_close() nounwind { +entry: + load i32 getelementptr (%struct.__gcov_var* @__gcov_var, i32 0, i32 5), align 4 ; :0 [#uses=1] + ret i32 %0 +} From nicholas at mxc.ca Fri Aug 8 02:00:10 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Fri, 08 Aug 2008 07:00:10 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54520 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200808080700.m7870AkF003024@zion.cs.uiuc.edu> Author: nicholas Date: Fri Aug 8 02:00:09 2008 New Revision: 54520 URL: http://llvm.org/viewvc/llvm-project?rev=54520&view=rev Log: Constant fold these GEPs upon construction. PR2603 Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54520&r1=54519&r2=54520&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug 8 02:00:09 2008 @@ -6111,7 +6111,7 @@ case VIEW_CONVERT_EXPR: return Convert(TREE_OPERAND(exp, 0)); case ADDR_EXPR: return ConstantExpr::getBitCast(EmitLV(TREE_OPERAND(exp, 0)), - ConvertType(TREE_TYPE(exp))); + ConvertType(TREE_TYPE(exp))); } } @@ -6979,7 +6979,14 @@ if (isArrayCompatible(ArrayType)) Idx.push_back(ConstantInt::get(Type::Int32Ty, 0)); Idx.push_back(IndexVal); - return ConstantExpr::getGetElementPtr(ArrayAddr, &Idx[0], Idx.size()); + + Constant ArrayRef = ConstantExpr::getGetElementPtr(ArrayAddr, &Idx[0], + Idx.size()); + + if (ConstantExpr CE = dyn_cast(ArrayRef)) + return ConstantFoldConstantExpression(CE, &getTargetData()); + else + return ArrayRef; } Constant TreeConstantToLLVM::EmitLV_COMPONENT_REF(tree exp) { From nicholas at mxc.ca Fri Aug 8 02:00:26 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Fri, 08 Aug 2008 07:00:26 -0000 Subject: [llvm-commits] [llvm] r54521 - /llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c Message-ID: <200808080700.m7870Rf9003044@zion.cs.uiuc.edu> Author: nicholas Date: Fri Aug 8 02:00:26 2008 New Revision: 54521 URL: http://llvm.org/viewvc/llvm-project?rev=54521&view=rev Log: Testcase for r54520. Added: llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c Added: llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c?rev=54521&view=auto ============================================================================== --- llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c (added) +++ llvm/trunk/test/FrontendC/2008-08-07-GEPIntToPtr.c Fri Aug 8 02:00:26 2008 @@ -0,0 +1,14 @@ +// RUN: %llvmgcc -S %s -o - \| grep {i8 1} +// PR2603 + +struct A { + char num_fields; +}; + +struct B { + char a, b[1]; +}; + +const struct A Foo = { + (char )(&( (struct B )(16) )->b[0]) - (char )(16) +}; From evan.cheng at apple.com Fri Aug 8 02:27:31 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 08 Aug 2008 07:27:31 -0000 Subject: [llvm-commits] [llvm] r54522 - in /llvm/trunk/lib/CodeGen/SelectionDAG: SelectionDAGISel.cpp SimpleBBISel.cpp SimpleBBISel.h Message-ID: <200808080727.m787RVcZ003959@zion.cs.uiuc.edu> Author: evancheng Date: Fri Aug 8 02:27:28 2008 New Revision: 54522 URL: http://llvm.org/viewvc/llvm-project?rev=54522&view=rev Log: Add skeleton of simple basic block instruction selector. Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54522&r1=54521&r2=54522&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Fri Aug 8 02:27:28 2008 @@ -12,10 +12,10 @@ //===----------------------------------------------------------------------===// #define DEBUG_TYPE "isel" +#include "llvm/CodeGen/SelectionDAGISel.h" +#include "SimpleBBISel.h" #include "llvm/ADT/BitVector.h" #include "llvm/Analysis/AliasAnalysis.h" -#include "llvm/CodeGen/SelectionDAGISel.h" -#include "llvm/CodeGen/ScheduleDAG.h" #include "llvm/Constants.h" #include "llvm/CallingConv.h" #include "llvm/DerivedTypes.h" @@ -33,6 +33,7 @@ #include "llvm/CodeGen/MachineJumpTableInfo.h" #include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/CodeGen/MachineRegisterInfo.h" +#include "llvm/CodeGen/ScheduleDAG.h" #include "llvm/CodeGen/SchedulerRegistry.h" #include "llvm/CodeGen/SelectionDAG.h" #include "llvm/Target/TargetRegisterInfo.h" @@ -5441,11 +5442,14 @@ // each basic block. NodeAllocatorType NodeAllocator; + SimpleBBISel SISel(MF, TLI); std::vector > PHINodesToUpdate; for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) { BasicBlock LLVMBB = &I; PHINodesToUpdate.clear(); - SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator); + + if (!FastISel \|\| !SISel.SelectBasicBlock(LLVMBB, FuncInfo.MBBMap[LLVMBB])) + SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator); FinishBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator); } } Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp?rev=54522&view=auto ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp (added) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp Fri Aug 8 02:27:28 2008 @@ -0,0 +1,29 @@ +//===-- SimpleBBISel.cpp - Implement the SimpleBBISel class ---------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This implements simple basic block instruction selection. If the given +// BasicBlock is considered "simple", i.e. all operations are supported by +// the target and their types are legal, it does instruction directly from +// LLVM BasicBlock to MachineInstr's. +// +//===----------------------------------------------------------------------===// + +#define DEBUG_TYPE "simple-isel" +#include "SimpleBBISel.h" +#include "llvm/CodeGen/MachineFunction.h" +#include "llvm/CodeGen/MachineInstrBuilder.h" +#include "llvm/CodeGen/SelectionDAG.h" +using namespace llvm; + +/// SelectBasicBlock - Try to convert a LLVM basic block into a +/// MachineBasicBlock using simple instruction selection. Returns false if it +/// is not able to do so. +bool SimpleBBISel::SelectBasicBlock(BasicBlock BB, MachineBasicBlock MBB) { + return false; +} Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h?rev=54522&view=auto ============================================================================== --- llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h (added) +++ llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h Fri Aug 8 02:27:28 2008 @@ -0,0 +1,45 @@ +//===-- SimpleBBISel.cpp - Definition of the SimpleBBISel class -----------===// +// +// The LLVM Compiler Infrastructure +// +// This file is distributed under the University of Illinois Open Source +// License. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// +// +// This file defines the SimpleBBISel class which handles simple basic block +// instruction selection. If the given BasicBlock is considered "simple", i.e. +// all operations are supported by the target and their types are legal, it +// does instruction directly from LLVM BasicBlock to MachineInstr's. +// +//===----------------------------------------------------------------------===// + +#ifndef SELECTIONDAG_SIMPLEBBISEL_H +#define SELECTIONDAG_SIMPLEBBISEL_H + +#include "llvm/Support/Compiler.h" + +namespace llvm { + +class BasicBlock; +class MachineBasicBlock; +class MachineFunction; +class TargetLowering; + +class VISIBILITY_HIDDEN SimpleBBISel { + MachineFunction &MF; + TargetLowering &TLI; + + public: + explicit SimpleBBISel(MachineFunction &mf, TargetLowering &tli) + : MF(mf), TLI(tli) {}; + + /// SelectBasicBlock - Try to convert a LLVM basic block into a + /// MachineBasicBlock using simple instruction selection. Returns false if it + /// is not able to do so. + bool SelectBasicBlock(BasicBlock BB, MachineBasicBlock MBB); +}; + +} // end namespace llvm. + +#endif From nicolas.geoffray at lip6.fr Fri Aug 8 02:30:34 2008 From: nicolas.geoffray at lip6.fr (Nicolas Geoffray) Date: Fri, 08 Aug 2008 00:30:34 -0700 Subject: [llvm-commits] [llvm] r54522 - in /llvm/trunk/lib/CodeGen/SelectionDAG: SelectionDAGISel.cpp SimpleBBISel.cpp SimpleBBISel.h In-Reply-To: <200808080727.m787RVcZ003959@zion.cs.uiuc.edu> References: <200808080727.m787RVcZ003959@zion.cs.uiuc.edu> Message-ID: <489BF61A.7050509@lip6.fr> That's awesome Evan! ;-) Thanks! It's going the right direction... :) Nicolas Evan Cheng wrote: > Author: evancheng > Date: Fri Aug 8 02:27:28 2008 > New Revision: 54522 > > URL: http://llvm.org/viewvc/llvm-project?rev=54522&view=rev > Log: > Add skeleton of simple basic block instruction selector. > > Added: > llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp > llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h > Modified: > llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp > > Modified: llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp?rev=54522&r1=54521&r2=54522&view=diff > > ============================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp (original) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp Fri Aug 8 02:27:28 2008 > @@ -12,10 +12,10 @@ > //===----------------------------------------------------------------------===// > > #define DEBUG_TYPE "isel" > +#include "llvm/CodeGen/SelectionDAGISel.h" > +#include "SimpleBBISel.h" > #include "llvm/ADT/BitVector.h" > #include "llvm/Analysis/AliasAnalysis.h" > -#include "llvm/CodeGen/SelectionDAGISel.h" > -#include "llvm/CodeGen/ScheduleDAG.h" > #include "llvm/Constants.h" > #include "llvm/CallingConv.h" > #include "llvm/DerivedTypes.h" > @@ -33,6 +33,7 @@ > #include "llvm/CodeGen/MachineJumpTableInfo.h" > #include "llvm/CodeGen/MachineModuleInfo.h" > #include "llvm/CodeGen/MachineRegisterInfo.h" > +#include "llvm/CodeGen/ScheduleDAG.h" > #include "llvm/CodeGen/SchedulerRegistry.h" > #include "llvm/CodeGen/SelectionDAG.h" > #include "llvm/Target/TargetRegisterInfo.h" > @@ -5441,11 +5442,14 @@ > // each basic block. > NodeAllocatorType NodeAllocator; > > + SimpleBBISel SISel(MF, TLI); > std::vector > PHINodesToUpdate; > for (Function::iterator I = Fn.begin(), E = Fn.end(); I != E; ++I) { > BasicBlock LLVMBB = &I; > PHINodesToUpdate.clear(); > - SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator); > + > + if (!FastISel \|\| !SISel.SelectBasicBlock(LLVMBB, FuncInfo.MBBMap[LLVMBB])) > + SelectBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator); > FinishBasicBlock(LLVMBB, MF, FuncInfo, PHINodesToUpdate, NodeAllocator); > } > } > > Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp?rev=54522&view=auto > > ============================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp (added) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.cpp Fri Aug 8 02:27:28 2008 > @@ -0,0 +1,29 @@ > +//===-- SimpleBBISel.cpp - Implement the SimpleBBISel class ---------------===// > +// > +// The LLVM Compiler Infrastructure > +// > +// This file is distributed under the University of Illinois Open Source > +// License. See LICENSE.TXT for details. > +// > +//===----------------------------------------------------------------------===// > +// > +// This implements simple basic block instruction selection. If the given > +// BasicBlock is considered "simple", i.e. all operations are supported by > +// the target and their types are legal, it does instruction directly from > +// LLVM BasicBlock to MachineInstr's. > +// > +//===----------------------------------------------------------------------===// > + > +#define DEBUG_TYPE "simple-isel" > +#include "SimpleBBISel.h" > +#include "llvm/CodeGen/MachineFunction.h" > +#include "llvm/CodeGen/MachineInstrBuilder.h" > +#include "llvm/CodeGen/SelectionDAG.h" > +using namespace llvm; > + > +/// SelectBasicBlock - Try to convert a LLVM basic block into a > +/// MachineBasicBlock using simple instruction selection. Returns false if it > +/// is not able to do so. > +bool SimpleBBISel::SelectBasicBlock(BasicBlock BB, MachineBasicBlock MBB) { > + return false; > +} > > Added: llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h?rev=54522&view=auto > > ============================================================================== > --- llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h (added) > +++ llvm/trunk/lib/CodeGen/SelectionDAG/SimpleBBISel.h Fri Aug 8 02:27:28 2008 > @@ -0,0 +1,45 @@ > +//===-- SimpleBBISel.cpp - Definition of the SimpleBBISel class -----------===// > +// > +// The LLVM Compiler Infrastructure > +// > +// This file is distributed under the University of Illinois Open Source > +// License. See LICENSE.TXT for details. > +// > +//===----------------------------------------------------------------------===// > +// > +// This file defines the SimpleBBISel class which handles simple basic block > +// instruction selection. If the given BasicBlock is considered "simple", i.e. > +// all operations are supported by the target and their types are legal, it > +// does instruction directly from LLVM BasicBlock to MachineInstr's. > +// > +//===----------------------------------------------------------------------===// > + > +#ifndef SELECTIONDAG_SIMPLEBBISEL_H > +#define SELECTIONDAG_SIMPLEBBISEL_H > + > +#include "llvm/Support/Compiler.h" > + > +namespace llvm { > + > +class BasicBlock; > +class MachineBasicBlock; > +class MachineFunction; > +class TargetLowering; > + > +class VISIBILITY_HIDDEN SimpleBBISel { > + MachineFunction &MF; > + TargetLowering &TLI; > + > + public: > + explicit SimpleBBISel(MachineFunction &mf, TargetLowering &tli) > + : MF(mf), TLI(tli) {}; > + > + /// SelectBasicBlock - Try to convert a LLVM basic block into a > + /// MachineBasicBlock using simple instruction selection. Returns false if it > + /// is not able to do so. > + bool SelectBasicBlock(BasicBlock BB, MachineBasicBlock MBB); > +}; > + > +} // end namespace llvm. > + > +#endif > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From baldrick at free.fr Fri Aug 8 02:50:33 2008 From: baldrick at free.fr (Duncan Sands) Date: Fri, 8 Aug 2008 09:50:33 +0200 Subject: [llvm-commits] [llvm-gcc-4.2] r54520 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200808080700.m7870AkF003024@zion.cs.uiuc.edu> References: <200808080700.m7870AkF003024@zion.cs.uiuc.edu> Message-ID: <200808080950.33160.baldrick@free.fr> Hi Nick, > + if (ConstantExpr CE = dyn_cast(ArrayRef)) > + return ConstantFoldConstantExpression(CE, &getTargetData()); in theory this method can return NULL (at least that's what the comment on it says). Ciao, Duncan. From evan.cheng at apple.com Fri Aug 8 03:11:36 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 08 Aug 2008 08:11:36 -0000 Subject: [llvm-commits] [llvm] r54523 - in /llvm/trunk: include/llvm/ExecutionEngine/ExecutionEngine.h lib/ExecutionEngine/ExecutionEngine.cpp lib/ExecutionEngine/ExecutionEngineBindings.cpp lib/ExecutionEngine/Interpreter/Interpreter.cpp lib/ExecutionEngine/Interpreter/Interpreter.h lib/ExecutionEngine/JIT/JIT.cpp lib/ExecutionEngine/JIT/JIT.h lib/ExecutionEngine/JIT/TargetSelect.cpp Message-ID: <200808080811.m788BasH019705@zion.cs.uiuc.edu> Author: evancheng Date: Fri Aug 8 03:11:34 2008 New Revision: 54523 URL: http://llvm.org/viewvc/llvm-project?rev=54523&view=rev Log: Add new parameter Fast to createJIT to enable the fast codegen path. Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp llvm/trunk/lib/ExecutionEngine/JIT/JIT.h llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp Modified: llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h?rev=54523&r1=54522&r2=54523&view=diff ============================================================================== --- llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h (original) +++ llvm/trunk/include/llvm/ExecutionEngine/ExecutionEngine.h Fri Aug 8 03:11:34 2008 @@ -79,7 +79,8 @@ // To avoid having libexecutionengine depend on the JIT and interpreter // libraries, the JIT and Interpreter set these functions to ctor pointers // at startup time if they are linked in. - typedef ExecutionEngine (EECtorFn)(ModuleProvider, std::string); + typedef ExecutionEngine (EECtorFn)(ModuleProvider, std::string, + bool Fast); static EECtorFn JITCtor, InterpCtor; /// LazyFunctionCreator - If an unknown function is needed, this function @@ -108,7 +109,8 @@ /// module provider. static ExecutionEngine create(ModuleProvider MP, bool ForceInterpreter = false, - std::string ErrorStr = 0); + std::string ErrorStr = 0, + bool Fast = false); /// create - This is the factory method for creating an execution engine which /// is appropriate for the current machine. This takes ownership of the @@ -120,7 +122,8 @@ /// of the ModuleProvider and JITMemoryManager if successful. static ExecutionEngine createJIT(ModuleProvider MP, std::string ErrorStr = 0, - JITMemoryManager JMM = 0); + JITMemoryManager JMM = 0, + bool Fast = false); Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp?rev=54523&r1=54522&r2=54523&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/ExecutionEngine.cpp Fri Aug 8 03:11:34 2008 @@ -345,7 +345,8 @@ /// ExecutionEngine ExecutionEngine::create(ModuleProvider MP, bool ForceInterpreter, - std::string ErrorStr) { + std::string ErrorStr, + bool Fast) { ExecutionEngine EE = 0; // Make sure we can resolve symbols in the program as well. The zero arg @@ -355,11 +356,11 @@ // Unless the interpreter was explicitly selected, try making a JIT. if (!ForceInterpreter && JITCtor) - EE = JITCtor(MP, ErrorStr); + EE = JITCtor(MP, ErrorStr, Fast); // If we can't make a JIT, make an interpreter instead. if (EE == 0 && InterpCtor) - EE = InterpCtor(MP, ErrorStr); + EE = InterpCtor(MP, ErrorStr, Fast); return EE; } Modified: llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp?rev=54523&r1=54522&r2=54523&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/ExecutionEngineBindings.cpp Fri Aug 8 03:11:34 2008 @@ -114,9 +114,11 @@ int LLVMCreateJITCompiler(LLVMExecutionEngineRef OutJIT, LLVMModuleProviderRef MP, - char OutError) { + char OutError, + bool Fast = false) { std::string Error; - if (ExecutionEngine JIT = ExecutionEngine::createJIT(unwrap(MP), &Error)) { + if (ExecutionEngine JIT = ExecutionEngine::createJIT(unwrap(MP), &Error, 0, + Fast)) { OutJIT = wrap(JIT); return 0; } Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp?rev=54523&r1=54522&r2=54523&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.cpp Fri Aug 8 03:11:34 2008 @@ -36,7 +36,8 @@ /// create - Create a new interpreter object. This can never fail. /// -ExecutionEngine Interpreter::create(ModuleProvider MP, std::string ErrStr) { +ExecutionEngine Interpreter::create(ModuleProvider MP, std::string* ErrStr, + bool Fast /unused/) { // Tell this ModuleProvide to materialize and release the module if (!MP->materializeModule(ErrStr)) // We got an error, just return 0 Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h?rev=54523&r1=54522&r2=54523&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h (original) +++ llvm/trunk/lib/ExecutionEngine/Interpreter/Interpreter.h Fri Aug 8 03:11:34 2008 @@ -108,7 +108,8 @@ /// create - Create an interpreter ExecutionEngine. This can never fail. /// - static ExecutionEngine create(ModuleProvider M, std::string ErrorStr = 0); + static ExecutionEngine create(ModuleProvider M, std::string ErrorStr = 0, + bool Fast /unused/ = 0); /// run - Start execution with the specified function and arguments. /// Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp?rev=54523&r1=54522&r2=54523&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.cpp Fri Aug 8 03:11:34 2008 @@ -73,8 +73,9 @@ /// of the module provider. ExecutionEngine ExecutionEngine::createJIT(ModuleProvider MP, std::string ErrorStr, - JITMemoryManager JMM) { - ExecutionEngine EE = JIT::createJIT(MP, ErrorStr, JMM); + JITMemoryManager JMM, + bool Fast) { + ExecutionEngine EE = JIT::createJIT(MP, ErrorStr, JMM, Fast); if (!EE) return 0; // Register routine for informing unwinding runtime about new EH frames @@ -89,7 +90,7 @@ } JIT::JIT(ModuleProvider MP, TargetMachine &tm, TargetJITInfo &tji, - JITMemoryManager JMM) + JITMemoryManager JMM, bool Fast) : ExecutionEngine(MP), TM(tm), TJI(tji) { setTargetData(TM.getTargetData()); @@ -105,7 +106,7 @@ // Turn the machine code intermediate representation into bytes in memory that // may be executed. - if (TM.addPassesToEmitMachineCode(PM, MCE, false /fast/)) { + if (TM.addPassesToEmitMachineCode(PM, MCE, Fast)) { cerr << "Target does not support machine code emission!\n"; abort(); } Modified: llvm/trunk/lib/ExecutionEngine/JIT/JIT.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/JIT.h?rev=54523&r1=54522&r2=54523&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/JIT.h (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/JIT.h Fri Aug 8 03:11:34 2008 @@ -56,7 +56,7 @@ JITState jitstate; JIT(ModuleProvider MP, TargetMachine &tm, TargetJITInfo &tji, - JITMemoryManager JMM); + JITMemoryManager JMM, bool Fast); public: ~JIT(); @@ -71,8 +71,9 @@ /// create - Create an return a new JIT compiler if there is one available /// for the current target. Otherwise, return null. /// - static ExecutionEngine create(ModuleProvider MP, std::string Err) { - return createJIT(MP, Err, 0); + static ExecutionEngine create(ModuleProvider MP, std::string Err, + bool Fast = false) { + return createJIT(MP, Err, 0, Fast); } virtual void addModuleProvider(ModuleProvider MP); @@ -128,7 +129,7 @@ MachineCodeEmitter getCodeEmitter() const { return MCE; } static ExecutionEngine createJIT(ModuleProvider MP, std::string Err, - JITMemoryManager JMM); + JITMemoryManager JMM, bool Fast); private: static MachineCodeEmitter createEmitter(JIT &J, JITMemoryManager JMM); Modified: llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp?rev=54523&r1=54522&r2=54523&view=diff ============================================================================== --- llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp (original) +++ llvm/trunk/lib/ExecutionEngine/JIT/TargetSelect.cpp Fri Aug 8 03:11:34 2008 @@ -41,7 +41,7 @@ /// available for the current target. Otherwise, return null. /// ExecutionEngine JIT::createJIT(ModuleProvider MP, std::string ErrorStr, - JITMemoryManager JMM) { + JITMemoryManager JMM, bool Fast) { const TargetMachineRegistry::entry TheArch = MArch; if (TheArch == 0) { std::string Error; @@ -73,7 +73,7 @@ // If the target supports JIT code generation, return a new JIT now. if (TargetJITInfo TJ = Target->getJITInfo()) - return new JIT(MP, Target, TJ, JMM); + return new JIT(MP, Target, TJ, JMM, Fast); if (ErrorStr) ErrorStr = "target does not support JIT code generation"; From evan.cheng at apple.com Fri Aug 8 03:12:07 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 08 Aug 2008 08:12:07 -0000 Subject: [llvm-commits] [llvm] r54524 - /llvm/trunk/tools/lli/lli.cpp Message-ID: <200808080812.m788C7Xd019806@zion.cs.uiuc.edu> Author: evancheng Date: Fri Aug 8 03:12:06 2008 New Revision: 54524 URL: http://llvm.org/viewvc/llvm-project?rev=54524&view=rev Log: Add -fast command line option to lli. It enables fast codegen path. Modified: llvm/trunk/tools/lli/lli.cpp Modified: llvm/trunk/tools/lli/lli.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=54524&r1=54523&r2=54524&view=diff ============================================================================== --- llvm/trunk/tools/lli/lli.cpp (original) +++ llvm/trunk/tools/lli/lli.cpp Fri Aug 8 03:12:06 2008 @@ -41,6 +41,12 @@ cl::opt ForceInterpreter("force-interpreter", cl::desc("Force interpretation: disable JIT"), cl::init(false)); + + cl::opt Fast("fast", + cl::desc("Generate code quickly, " + "potentially sacrificing code quality"), + cl::init(false)); + cl::opt TargetTriple("mtriple", cl::desc("Override target triple for module")); @@ -106,7 +112,7 @@ if (!TargetTriple.empty()) Mod->setTargetTriple(TargetTriple); - EE = ExecutionEngine::create(MP, ForceInterpreter, &ErrorMsg); + EE = ExecutionEngine::create(MP, ForceInterpreter, &ErrorMsg, Fast); if (!EE && !ErrorMsg.empty()) { std::cerr << argv[0] << ":error creating EE: " << ErrorMsg << "\n"; exit(1); From asl at math.spbu.ru Fri Aug 8 05:03:02 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 14:03:02 +0400 Subject: [llvm-commits] [llvm] r54519 - in /llvm/trunk: include/llvm/Target/DarwinTargetAsmInfo.h include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/DarwinTargetAsmInfo.cpp lib/Target/ELFTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll In-Reply-To: <200808080656.m786uHPq002844@zion.cs.uiuc.edu> References: <200808080656.m786uHPq002844@zion.cs.uiuc.edu> Message-ID: <1218189782.31128.61.camel@localhost> Hi, Evan > + virtual const Section SelectSectionForGlobal(const GlobalValue GV, > + bool NoCoalesce = false) const; This approach seems to be pretty hackish and definitely cannot be solution here, since it adds target-specific stuff (coalesced sections) into generic interface. Could you please provide a C testcase, I'll try to see how mainline gcc (from iPhone SDK) deals with this problem and fix the stuff properly. -- With best regards, Anton Korobeynikov. Faculty of Mathematics & Mechanics, Saint Petersburg State University. From sabre at nondot.org Fri Aug 8 10:14:12 2008 From: sabre at nondot.org (Chris Lattner) Date: Fri, 08 Aug 2008 15:14:12 -0000 Subject: [llvm-commits] [llvm] r54528 - in /llvm/trunk: include/llvm/PassManagers.h lib/Analysis/IPA/CallGraphSCCPass.cpp lib/Analysis/LoopPass.cpp lib/VMCore/PassManager.cpp Message-ID: <200808081514.m78FEDRM001478@zion.cs.uiuc.edu> Author: lattner Date: Fri Aug 8 10:14:09 2008 New Revision: 54528 URL: http://llvm.org/viewvc/llvm-project?rev=54528&view=rev Log: Don't call getAnalysisUsage unless -debug-pass is enabled. This speeds up the passmgr by avoiding useless work. Modified: llvm/trunk/include/llvm/PassManagers.h llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp llvm/trunk/lib/Analysis/LoopPass.cpp llvm/trunk/lib/VMCore/PassManager.cpp Modified: llvm/trunk/include/llvm/PassManagers.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/PassManagers.h?rev=54528&r1=54527&r2=54528&view=diff ============================================================================== --- llvm/trunk/include/llvm/PassManagers.h (original) +++ llvm/trunk/include/llvm/PassManagers.h Fri Aug 8 10:14:09 2008 @@ -308,8 +308,8 @@ void dumpPassArguments() const; void dumpPassInfo(Pass P, enum PassDebuggingString S1, enum PassDebuggingString S2, const char Msg); - void dumpAnalysisSetInfo(const char Msg, Pass P, - const AnalysisUsage::VectorType &Set) const; + void dumpRequiredSet(const Pass P) const; + void dumpPreservedSet(const Pass P) const; virtual unsigned getNumContainedPasses() const { return (unsigned)PassVector.size(); @@ -346,6 +346,9 @@ std::map InheritedAnalysis[PMT_Last]; private: + void dumpAnalysisUsage(const char Msg, const Pass P, + const AnalysisUsage::VectorType &Set) const; + // Set of available Analysis. This information is used while scheduling // pass. If a pass requires an analysis which is not not available then // equired analysis pass is scheduled to run before the pass itself is Modified: llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp?rev=54528&r1=54527&r2=54528&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp (original) +++ llvm/trunk/lib/Analysis/IPA/CallGraphSCCPass.cpp Fri Aug 8 10:14:09 2008 @@ -91,11 +91,9 @@ // Run all passes on current SCC for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) { Pass P = getContainedPass(Index); - AnalysisUsage AnUsage; - P->getAnalysisUsage(AnUsage); dumpPassInfo(P, EXECUTION_MSG, ON_CG_MSG, ""); - dumpAnalysisSetInfo("Required", P, AnUsage.getRequiredSet()); + dumpRequiredSet(P); initializeAnalysisImpl(P); @@ -120,7 +118,7 @@ if (Changed) dumpPassInfo(P, MODIFICATION_MSG, ON_CG_MSG, ""); - dumpAnalysisSetInfo("Preserved", P, AnUsage.getPreservedSet()); + dumpPreservedSet(P); verifyPreservedAnalysis(P); removeNotPreservedAnalysis(P); Modified: llvm/trunk/lib/Analysis/LoopPass.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/LoopPass.cpp?rev=54528&r1=54527&r2=54528&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/LoopPass.cpp (original) +++ llvm/trunk/lib/Analysis/LoopPass.cpp Fri Aug 8 10:14:09 2008 @@ -214,11 +214,9 @@ for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) { Pass P = getContainedPass(Index); - AnalysisUsage AnUsage; - P->getAnalysisUsage(AnUsage); dumpPassInfo(P, EXECUTION_MSG, ON_LOOP_MSG, ""); - dumpAnalysisSetInfo("Required", P, AnUsage.getRequiredSet()); + dumpRequiredSet(P); initializeAnalysisImpl(P); @@ -230,7 +228,7 @@ if (Changed) dumpPassInfo(P, MODIFICATION_MSG, ON_LOOP_MSG, ""); - dumpAnalysisSetInfo("Preserved", P, AnUsage.getPreservedSet()); + dumpPreservedSet(P); verifyPreservedAnalysis(LP); removeNotPreservedAnalysis(P); Modified: llvm/trunk/lib/VMCore/PassManager.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/PassManager.cpp?rev=54528&r1=54527&r2=54528&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/PassManager.cpp (original) +++ llvm/trunk/lib/VMCore/PassManager.cpp Fri Aug 8 10:14:09 2008 @@ -954,17 +954,38 @@ } } -void PMDataManager::dumpAnalysisSetInfo(const char Msg, Pass P, +void PMDataManager::dumpRequiredSet(const Pass P) + const { + if (PassDebugging < Details) + return; + + AnalysisUsage analysisUsage; + P->getAnalysisUsage(analysisUsage); + dumpAnalysisUsage("Required", P, analysisUsage.getRequiredSet()); +} + +void PMDataManager::dumpPreservedSet(const Pass P) + const { + if (PassDebugging < Details) + return; + + AnalysisUsage analysisUsage; + P->getAnalysisUsage(analysisUsage); + dumpAnalysisUsage("Preserved", P, analysisUsage.getPreservedSet()); +} + +void PMDataManager::dumpAnalysisUsage(const char Msg, const Pass P, const AnalysisUsage::VectorType &Set) const { - if (PassDebugging >= Details && !Set.empty()) { - cerr << (void)P << std::string(getDepth()2+3, ' ') << Msg << " Analyses:"; - for (unsigned i = 0; i != Set.size(); ++i) { - if (i) cerr << ","; - cerr << " " << Set[i]->getPassName(); - } - cerr << "\n"; - } + assert(PassDebugging >= Details); + if (Set.empty()) + return; + cerr << (void)P << std::string(getDepth()2+3, ' ') << Msg << " Analyses:"; + for (unsigned i = 0; i != Set.size(); ++i) { + if (i) cerr << ","; + cerr << " " << Set[i]->getPassName(); + } + cerr << "\n"; } /// Add RequiredPass into list of lower level passes required by pass P. @@ -1031,11 +1052,9 @@ for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I) for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) { BasicBlockPass BP = getContainedPass(Index); - AnalysisUsage AnUsage; - BP->getAnalysisUsage(AnUsage); dumpPassInfo(BP, EXECUTION_MSG, ON_BASICBLOCK_MSG, I->getNameStart()); - dumpAnalysisSetInfo("Required", BP, AnUsage.getRequiredSet()); + dumpRequiredSet(BP); initializeAnalysisImpl(BP); @@ -1046,7 +1065,7 @@ if (Changed) dumpPassInfo(BP, MODIFICATION_MSG, ON_BASICBLOCK_MSG, I->getNameStart()); - dumpAnalysisSetInfo("Preserved", BP, AnUsage.getPreservedSet()); + dumpPreservedSet(BP); verifyPreservedAnalysis(BP); removeNotPreservedAnalysis(BP); @@ -1232,11 +1251,8 @@ for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) { FunctionPass FP = getContainedPass(Index); - AnalysisUsage AnUsage; - FP->getAnalysisUsage(AnUsage); - dumpPassInfo(FP, EXECUTION_MSG, ON_FUNCTION_MSG, F.getNameStart()); - dumpAnalysisSetInfo("Required", FP, AnUsage.getRequiredSet()); + dumpRequiredSet(FP); initializeAnalysisImpl(FP); @@ -1246,7 +1262,7 @@ if (Changed) dumpPassInfo(FP, MODIFICATION_MSG, ON_FUNCTION_MSG, F.getNameStart()); - dumpAnalysisSetInfo("Preserved", FP, AnUsage.getPreservedSet()); + dumpPreservedSet(FP); verifyPreservedAnalysis(FP); removeNotPreservedAnalysis(FP); @@ -1304,12 +1320,9 @@ for (unsigned Index = 0; Index < getNumContainedPasses(); ++Index) { ModulePass MP = getContainedPass(Index); - AnalysisUsage AnUsage; - MP->getAnalysisUsage(AnUsage); - dumpPassInfo(MP, EXECUTION_MSG, ON_MODULE_MSG, M.getModuleIdentifier().c_str()); - dumpAnalysisSetInfo("Required", MP, AnUsage.getRequiredSet()); + dumpRequiredSet(MP); initializeAnalysisImpl(MP); @@ -1320,7 +1333,7 @@ if (Changed) dumpPassInfo(MP, MODIFICATION_MSG, ON_MODULE_MSG, M.getModuleIdentifier().c_str()); - dumpAnalysisSetInfo("Preserved", MP, AnUsage.getPreservedSet()); + dumpPreservedSet(MP); verifyPreservedAnalysis(MP); removeNotPreservedAnalysis(MP); From evan.cheng at apple.com Fri Aug 8 10:38:27 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 8 Aug 2008 08:38:27 -0700 Subject: [llvm-commits] [llvm] r54519 - in /llvm/trunk: include/llvm/Target/DarwinTargetAsmInfo.h include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/DarwinTargetAsmInfo.cpp lib/Target/ELFTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll In-Reply-To: <1218189782.31128.61.camel@localhost> References: <200808080656.m786uHPq002844@zion.cs.uiuc.edu> <1218189782.31128.61.camel@localhost> Message-ID: <5920B5CE-7F21-49DC-A968-4EE2C7993A74@apple.com> Yeah, I realized I over-thought the problem after I went to bed: struct x { int a; int b; } X __attribute__((weak)) = { 1, 2 }; void set(int b) { X.b = b; } All the extra logic is not needed since the PIC relative expression is using GV stub. Feel free to undo my patch (except the ARMAsmPrinter part the choose lcomm instead of comm). Or I will get to it later today. Evan On Aug 8, 2008, at 3:03 AM, Anton Korobeynikov wrote: > Hi, Evan > >> + virtual const Section SelectSectionForGlobal(const >> GlobalValue GV, >> + bool NoCoalesce = >> false) const; > This approach seems to be pretty hackish and definitely cannot be > solution here, since it adds target-specific stuff (coalesced > sections) > into generic interface. Could you please provide a C testcase, I'll > try > to see how mainline gcc (from iPhone SDK) deals with this problem and > fix the stuff properly. > > -- > With best regards, Anton Korobeynikov. > > Faculty of Mathematics & Mechanics, Saint Petersburg State University. > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From asl at math.spbu.ru Fri Aug 8 10:44:09 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 19:44:09 +0400 Subject: [llvm-commits] [llvm] r54519 - in /llvm/trunk: include/llvm/Target/DarwinTargetAsmInfo.h include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/DarwinTargetAsmInfo.cpp lib/Target/ELFTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp test/CodeGen/ARM/2008-08-07-AsmPrintBug.ll In-Reply-To: <5920B5CE-7F21-49DC-A968-4EE2C7993A74.SS1247SS@apple.com> References: <200808080656.m786uHPq002844@zion.cs.uiuc.edu> <1218189782.31128.61.camel@localhost> <5920B5CE-7F21-49DC-A968-4EE2C7993A74.SS1247SS@apple.com> Message-ID: <1218210249.31128.81.camel@localhost> Hello, Evan > All the extra logic is not needed since the PIC relative expression is > using GV stub. Feel free to undo my patch (except the ARMAsmPrinter > part the choose lcomm instead of comm). Or I will get to it later today. Ok, will undo. I'm also preparing a series of patches to generalize uninitialized stuff handling, so hopefully all those comm/lcomm dances will be handled with all generality. -- With best regards, Anton Korobeynikov. Faculty of Mathematics & Mechanics, Saint Petersburg State University. From isanbard at gmail.com Fri Aug 8 12:23:36 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 17:23:36 -0000 Subject: [llvm-commits] [llvm] r54531 - /llvm/tags/Apple/llvmCore-2063/ Message-ID: <200808081723.m78HNaS8006943@zion.cs.uiuc.edu> Author: void Date: Fri Aug 8 12:23:36 2008 New Revision: 54531 URL: http://llvm.org/viewvc/llvm-project?rev=54531&view=rev Log: Creating llvmCore-2063 branch Added: llvm/tags/Apple/llvmCore-2063/ - copied from r54530, llvm/trunk/ From isanbard at gmail.com Fri Aug 8 12:23:43 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 08 Aug 2008 17:23:43 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54532 - /llvm-gcc-4.2/tags/Apple/llvmgcc42-2063/ Message-ID: <200808081723.m78HNhrv006958@zion.cs.uiuc.edu> Author: void Date: Fri Aug 8 12:23:43 2008 New Revision: 54532 URL: http://llvm.org/viewvc/llvm-project?rev=54532&view=rev Log: Creating llvmgcc42-2063 branch Added: llvm-gcc-4.2/tags/Apple/llvmgcc42-2063/ - copied from r54531, llvm-gcc-4.2/trunk/ From evan.cheng at apple.com Fri Aug 8 12:56:50 2008 From: evan.cheng at apple.com (Evan Cheng) Date: Fri, 08 Aug 2008 17:56:50 -0000 Subject: [llvm-commits] [llvm] r54534 - in /llvm/trunk: include/llvm/Target/DarwinTargetAsmInfo.h include/llvm/Target/ELFTargetAsmInfo.h include/llvm/Target/TargetAsmInfo.h lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/DarwinTargetAsmInfo.cpp lib/Target/ELFTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.cpp lib/Target/Mips/MipsTargetAsmInfo.h lib/Target/TargetAsmInfo.cpp Message-ID: <200808081756.m78Hupot008337@zion.cs.uiuc.edu> Author: evancheng Date: Fri Aug 8 12:56:50 2008 New Revision: 54534 URL: http://llvm.org/viewvc/llvm-project?rev=54534&view=rev Log: Undo most of r54519. Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h llvm/trunk/include/llvm/Target/TargetAsmInfo.h llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h llvm/trunk/lib/Target/TargetAsmInfo.cpp Modified: llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/DarwinTargetAsmInfo.h Fri Aug 8 12:56:50 2008 @@ -30,8 +30,7 @@ const Section DataCoalSection; explicit DarwinTargetAsmInfo(const TargetMachine &TM); - virtual const Section* SelectSectionForGlobal(const GlobalValue GV, - bool NoCoalesce = false) const; + virtual const Section SelectSectionForGlobal(const GlobalValue GV) const; virtual std::string UniqueSectionForGlobal(const GlobalValue GV, SectionKind::Kind kind) const; const Section* MergeableConstSection(const GlobalVariable GV) const; Modified: llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/ELFTargetAsmInfo.h Fri Aug 8 12:56:50 2008 @@ -26,8 +26,7 @@ struct ELFTargetAsmInfo: public virtual TargetAsmInfo { explicit ELFTargetAsmInfo(const TargetMachine &TM); - virtual const Section SelectSectionForGlobal(const GlobalValue GV, - bool NoCoalesce = false) const; + virtual const Section SelectSectionForGlobal(const GlobalValue GV) const; virtual std::string PrintSectionFlags(unsigned flags) const; const Section MergeableConstSection(const GlobalVariable GV) const; inline const Section MergeableConstSection(const Type Ty) const; Modified: llvm/trunk/include/llvm/Target/TargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Target/TargetAsmInfo.h?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/include/llvm/Target/TargetAsmInfo.h (original) +++ llvm/trunk/include/llvm/Target/TargetAsmInfo.h Fri Aug 8 12:56:50 2008 @@ -544,10 +544,8 @@ const char name = NULL) const; /// SectionForGlobal - This hooks returns proper section name for given - /// global with all necessary flags and marks. If NoCoalesce is true, - /// do not use coalesced section. - virtual std::string SectionForGlobal(const GlobalValue GV, - bool NoCoalesce = false) const; + /// global with all necessary flags and marks. + virtual std::string SectionForGlobal(const GlobalValue GV) const; // Helper methods for SectionForGlobal virtual std::string UniqueSectionForGlobal(const GlobalValue* GV, @@ -555,8 +553,7 @@ virtual std::string PrintSectionFlags(unsigned flags) const { return ""; } - virtual const Section* SelectSectionForGlobal(const GlobalValue GV, - bool NoCoalesce = false) const; + virtual const Section SelectSectionForGlobal(const GlobalValue GV) const; virtual const Section SelectSectionForMachineConst(const Type Ty) const; Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Fri Aug 8 12:56:50 2008 @@ -863,8 +863,7 @@ return; } - bool NoCoalesc = PCRelGVs.count(GVar); - std::string SectionName = TAI->SectionForGlobal(GVar, NoCoalesc); + std::string SectionName = TAI->SectionForGlobal(GVar); std::string name = Mang->getValueName(GVar); Constant C = GVar->getInitializer(); const Type Type = C->getType(); @@ -901,7 +900,7 @@ if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. if (TAI->getLCOMMDirective() != NULL) { - if (NoCoalesc \|\| GVar->hasInternalLinkage()) { + if (PCRelGVs.count(GVar) \|\| GVar->hasInternalLinkage()) { O << TAI->getLCOMMDirective() << name << "," << Size; if (Subtarget->isTargetDarwin()) O << "," << Align; Modified: llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/DarwinTargetAsmInfo.cpp Fri Aug 8 12:56:50 2008 @@ -51,15 +51,14 @@ } const Section -DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV, - bool NoCoalesce) const { +DarwinTargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV) const { SectionKind::Kind Kind = SectionKindForGlobal(GV); - bool CanCoalesce = !NoCoalesce && GV->isWeakForLinker(); + bool isWeak = GV->isWeakForLinker(); bool isNonStatic = (DTM->getRelocationModel() != Reloc::Static); switch (Kind) { case SectionKind::Text: - if (CanCoalesce) + if (isWeak) return TextCoalSection; else return getTextSection_(); @@ -68,18 +67,18 @@ case SectionKind::BSS: case SectionKind::ThreadBSS: if (cast(GV)->isConstant()) - return (CanCoalesce ? ConstDataCoalSection : ConstDataSection); + return (isWeak ? ConstDataCoalSection : ConstDataSection); else - return (CanCoalesce ? DataCoalSection : getDataSection_()); + return (isWeak ? DataCoalSection : getDataSection_()); case SectionKind::ROData: - return (CanCoalesce ? ConstDataCoalSection : + return (isWeak ? ConstDataCoalSection : (isNonStatic ? ConstDataSection : getReadOnlySection_())); case SectionKind::RODataMergeStr: - return (CanCoalesce ? + return (isWeak ? ConstDataCoalSection : MergeableStringSection(cast(GV))); case SectionKind::RODataMergeConst: - return (CanCoalesce ? + return (isWeak ? ConstDataCoalSection: MergeableConstSection(cast(GV))); default: Modified: llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/ELFTargetAsmInfo.cpp Fri Aug 8 12:56:50 2008 @@ -40,8 +40,7 @@ } const Section* -ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV, - bool NoCoalesce) const { +ELFTargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV) const { SectionKind::Kind Kind = SectionKindForGlobal(GV); if (const Function F = dyn_cast(GV)) { Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.cpp Fri Aug 8 12:56:50 2008 @@ -82,7 +82,7 @@ } const Section MipsTargetAsmInfo:: -SelectSectionForGlobal(const GlobalValue GV, bool NoCoalesce) const { +SelectSectionForGlobal(const GlobalValue GV) const { SectionKind::Kind K = SectionKindForGlobal(GV); const GlobalVariable GVA = dyn_cast(GV); Modified: llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h (original) +++ llvm/trunk/lib/Target/Mips/MipsTargetAsmInfo.h Fri Aug 8 12:56:50 2008 @@ -40,8 +40,7 @@ SectionFlagsForGlobal(const GlobalValue GV = NULL, const char* name = NULL) const; - virtual const Section* SelectSectionForGlobal(const GlobalValue GV, - bool NoCoalesce) const; + virtual const Section SelectSectionForGlobal(const GlobalValue GV) const; private: const MipsSubtarget Subtarget; Modified: llvm/trunk/lib/Target/TargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/TargetAsmInfo.cpp?rev=54534&r1=54533&r2=54534&view=diff ============================================================================== --- llvm/trunk/lib/Target/TargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/TargetAsmInfo.cpp Fri Aug 8 12:56:50 2008 @@ -272,7 +272,7 @@ } std::string -TargetAsmInfo::SectionForGlobal(const GlobalValue GV, bool NoCoalesce) const { +TargetAsmInfo::SectionForGlobal(const GlobalValue GV) const { const Section* S; // Select section name if (GV->hasSection()) { @@ -282,7 +282,7 @@ S = getNamedSection(GV->getSection().c_str(), Flags); } else { // Use default section depending on the 'type' of global - S = SelectSectionForGlobal(GV, NoCoalesce); + S = SelectSectionForGlobal(GV); } if (!S->isNamed()) @@ -295,8 +295,8 @@ } // Lame default implementation. Calculate the section name for global. -const Section* TargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV, - bool NoCoalesce) const { +const Section +TargetAsmInfo::SelectSectionForGlobal(const GlobalValue GV) const { SectionKind::Kind Kind = SectionKindForGlobal(GV); if (GV->isWeakForLinker()) { From resistor at mac.com Fri Aug 8 13:00:06 2008 From: resistor at mac.com (Owen Anderson) Date: Fri, 08 Aug 2008 18:00:06 -0000 Subject: [llvm-commits] [llvm] r54535 - /llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Message-ID: <200808081800.m78I063W008466@zion.cs.uiuc.edu> Author: resistor Date: Fri Aug 8 13:00:05 2008 New Revision: 54535 URL: http://llvm.org/viewvc/llvm-project?rev=54535&view=rev Log: Reduce the entries in a phi before testing it for deadness, because removing the entries might make it dead. Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Modified: llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp?rev=54535&r1=54534&r2=54535&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp (original) +++ llvm/trunk/lib/CodeGen/UnreachableBlockElim.cpp Fri Aug 8 13:00:05 2008 @@ -152,6 +152,12 @@ MachineBasicBlock::iterator phi = BB->begin(); while (phi != BB->end() && phi->getOpcode() == TargetInstrInfo::PHI) { + for (unsigned i = phi->getNumOperands() - 1; i >= 2; i-=2) + if (!preds.count(phi->getOperand(i).getMBB())) { + phi->RemoveOperand(i); + phi->RemoveOperand(i-1); + } + if (phi->getNumOperands() == 3) { unsigned Input = phi->getOperand(1).getReg(); unsigned Output = phi->getOperand(0).getReg(); @@ -162,15 +168,9 @@ if (Input != Output) F.getRegInfo().replaceRegWith(Output, Input); - + continue; } - - for (unsigned i = phi->getNumOperands() - 1; i >= 2; i-=2) - if (!preds.count(phi->getOperand(i).getMBB())) { - phi->RemoveOperand(i); - phi->RemoveOperand(i-1); - } ++phi; } From asl at math.spbu.ru Fri Aug 8 13:23:00 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 18:23:00 -0000 Subject: [llvm-commits] [llvm] r54536 - /llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Message-ID: <200808081823.m78IN0gY009491@zion.cs.uiuc.edu> Author: asl Date: Fri Aug 8 13:22:59 2008 New Revision: 54536 URL: http://llvm.org/viewvc/llvm-project?rev=54536&view=rev Log: Cleanup Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54536&r1=54535&r2=54536&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug 8 13:22:59 2008 @@ -87,7 +87,7 @@ void printMachineInstruction(const MachineInstr MI); void printOp(const MachineOperand &MO); - + /// stripRegisterPrefix - This method strips the character prefix from a /// register name so that only the number is left. Used by for linux asm. const char stripRegisterPrefix(const char RegName) { @@ -97,22 +97,22 @@ case 'v': return RegName + 1; case 'c': if (RegName[1] == 'r') return RegName + 2; } - + return RegName; } - + /// printRegister - Print register according to target requirements. /// void printRegister(const MachineOperand &MO, bool R0AsZero) { unsigned RegNo = MO.getReg(); assert(TargetRegisterInfo::isPhysicalRegister(RegNo) && "Not physreg??"); - + // If we should use 0 for R0. if (R0AsZero && RegNo == PPC::R0) { O << "0"; return; } - + const char RegName = TM.getRegisterInfo()->get(RegNo).AsmName; // Linux assembler (Others?) does not take register mnemonics. // FIXME - What about special registers used in mfspr/mtspr? @@ -130,13 +130,13 @@ printOp(MO); } } - + bool PrintAsmOperand(const MachineInstr MI, unsigned OpNo, unsigned AsmVariant, const char ExtraCode); bool PrintAsmMemoryOperand(const MachineInstr MI, unsigned OpNo, unsigned AsmVariant, const char ExtraCode); - - + + void printS5ImmOperand(const MachineInstr MI, unsigned OpNo) { char value = MI->getOperand(OpNo).getImm(); value = (value << (32-5)) >> (32-5); @@ -202,7 +202,7 @@ return; } } - + printOp(MI->getOperand(OpNo)); } void printAbsAddrOperand(const MachineInstr MI, unsigned OpNo) { @@ -249,7 +249,7 @@ void printMemRegImm(const MachineInstr MI, unsigned OpNo) { printSymbolLo(MI, OpNo); O << '('; - if (MI->getOperand(OpNo+1).isRegister() && + if (MI->getOperand(OpNo+1).isRegister() && MI->getOperand(OpNo+1).getReg() == PPC::R0) O << "0"; else @@ -259,17 +259,17 @@ void printMemRegImmShifted(const MachineInstr MI, unsigned OpNo) { if (MI->getOperand(OpNo).isImmediate()) printS16X4ImmOperand(MI, OpNo); - else + else printSymbolLo(MI, OpNo); O << '('; - if (MI->getOperand(OpNo+1).isRegister() && + if (MI->getOperand(OpNo+1).isRegister() && MI->getOperand(OpNo+1).getReg() == PPC::R0) O << "0"; else printOperand(MI, OpNo+1); O << ')'; } - + void printMemRegReg(const MachineInstr MI, unsigned OpNo) { // When used as the base register, r0 reads constant zero rather than // the value contained in the register. For this reason, the darwin @@ -279,23 +279,23 @@ O << ", "; printOperand(MI, OpNo+1); } - - void printPredicateOperand(const MachineInstr MI, unsigned OpNo, + + void printPredicateOperand(const MachineInstr MI, unsigned OpNo, const char Modifier); - + virtual bool runOnMachineFunction(MachineFunction &F) = 0; virtual bool doFinalization(Module &M) = 0; virtual void EmitExternalGlobal(const GlobalVariable GV); }; - /// LinuxAsmPrinter - PowerPC assembly printer, customized for Linux - struct VISIBILITY_HIDDEN LinuxAsmPrinter : public PPCAsmPrinter { + /// PPCLinuxAsmPrinter - PowerPC assembly printer, customized for Linux + struct VISIBILITY_HIDDEN PPCLinuxAsmPrinter : public PPCAsmPrinter { DwarfWriter DW; MachineModuleInfo MMI; - LinuxAsmPrinter(std::ostream &O, PPCTargetMachine &TM, + PPCLinuxAsmPrinter(std::ostream &O, PPCTargetMachine &TM, const TargetAsmInfo T) : PPCAsmPrinter(O, TM, T), DW(O, this, T), MMI(0) { } @@ -307,7 +307,7 @@ bool runOnMachineFunction(MachineFunction &F); bool doInitialization(Module &M); bool doFinalization(Module &M); - + void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); AU.addRequired(); @@ -319,26 +319,26 @@ virtual std::string getSectionForFunction(const Function &F) const; }; - /// DarwinAsmPrinter - PowerPC assembly printer, customized for Darwin/Mac OS - /// X - struct VISIBILITY_HIDDEN DarwinAsmPrinter : public PPCAsmPrinter { - + /// PPCDarwinAsmPrinter - PowerPC assembly printer, customized for Darwin/Mac + /// OS X + struct VISIBILITY_HIDDEN PPCDarwinAsmPrinter : public PPCAsmPrinter { + DwarfWriter DW; MachineModuleInfo MMI; - DarwinAsmPrinter(std::ostream &O, PPCTargetMachine &TM, - const TargetAsmInfo T) + PPCDarwinAsmPrinter(std::ostream &O, PPCTargetMachine &TM, + const TargetAsmInfo T) : PPCAsmPrinter(O, TM, T), DW(O, this, T), MMI(0) { } virtual const char getPassName() const { return "Darwin PPC Assembly Printer"; } - + bool runOnMachineFunction(MachineFunction &F); bool doInitialization(Module &M); bool doFinalization(Module &M); - + void getAnalysisUsage(AnalysisUsage &AU) const { AU.setPreservesAll(); AU.addRequired(); @@ -400,12 +400,12 @@ } } O << Name; - + if (MO.getOffset() > 0) O << "+" << MO.getOffset(); else if (MO.getOffset() < 0) O << MO.getOffset(); - + if (GV->hasExternalWeakLinkage()) ExtWeakSymbols.insert(GV); return; @@ -432,19 +432,19 @@ /// PrintAsmOperand - Print out an operand for an inline asm expression. /// bool PPCAsmPrinter::PrintAsmOperand(const MachineInstr MI, unsigned OpNo, - unsigned AsmVariant, + unsigned AsmVariant, const char ExtraCode) { // Does this asm operand have a single letter operand modifier? if (ExtraCode && ExtraCode[0]) { if (ExtraCode[1] != 0) return true; // Unknown modifier. - + switch (ExtraCode[0]) { default: return true; // Unknown modifier. case 'c': // Don't print "$" before a global var name or constant. // PPC never has a prefix. printOperand(MI, OpNo); return false; - case 'L': // Write second word of DImode reference. + case 'L': // Write second word of DImode reference. // Verify that this operand has two consecutive registers. if (!MI->getOperand(OpNo).isRegister() \|\| OpNo+1 == MI->getNumOperands() \|\| @@ -460,13 +460,13 @@ return false; } } - + printOperand(MI, OpNo); return false; } bool PPCAsmPrinter::PrintAsmMemoryOperand(const MachineInstr MI, unsigned OpNo, - unsigned AsmVariant, + unsigned AsmVariant, const char ExtraCode) { if (ExtraCode && ExtraCode[0]) return true; // Unknown modifier. @@ -477,7 +477,7 @@ return false; } -void PPCAsmPrinter::printPredicateOperand(const MachineInstr MI, unsigned OpNo, +void PPCAsmPrinter::printPredicateOperand(const MachineInstr MI, unsigned OpNo, const char Modifier) { assert(Modifier && "Must specify 'cc' or 'reg' as predicate op modifier!"); unsigned Code = MI->getOperand(OpNo).getImm(); @@ -493,7 +493,7 @@ case PPC::PRED_UN: O << "un"; return; case PPC::PRED_NU: O << "nu"; return; } - + } else { assert(!strcmp(Modifier, "reg") && "Need to specify 'cc' or 'reg' as predicate op modifier!"); @@ -564,18 +564,18 @@ /// runOnMachineFunction - This uses the printMachineInstruction() /// method to print assembly for each instruction. /// -bool LinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) { +bool PPCLinuxAsmPrinter::runOnMachineFunction(MachineFunction &MF) { SetupMachineFunction(MF); O << "\n\n"; - + // Print out constants referenced by the function EmitConstantPool(MF.getConstantPool()); // Print out labels for the function. const Function F = MF.getFunction(); SwitchToTextSection(getSectionForFunction(F).c_str(), F); - + switch (F->getLinkage()) { default: assert(0 && "Unknown linkage type!"); case Function::InternalLinkage: // Symbols default to internal. @@ -590,11 +590,11 @@ O << "\t.weak\t" << CurrentFnName << '\n'; break; } - + if (F->hasHiddenVisibility()) if (const char Directive = TAI->getHiddenDirective()) O << Directive << CurrentFnName << "\n"; - + EmitAlignment(2, F); O << CurrentFnName << ":\n"; @@ -620,17 +620,17 @@ // Print out jump tables referenced by the function. EmitJumpTableInfo(MF.getJumpTableInfo(), MF); - + // Emit post-function debug information. DW.EndFunction(); - + // We didn't modify anything. return false; } -bool LinuxAsmPrinter::doInitialization(Module &M) { +bool PPCLinuxAsmPrinter::doInitialization(Module &M) { bool Result = AsmPrinter::doInitialization(M); - + // Emit initial debug information. DW.BeginModule(&M); @@ -643,7 +643,7 @@ Mang->setUseQuotes(true); SwitchToTextSection(TAI->getTextSection()); - + return Result; } @@ -656,14 +656,14 @@ OS << Name; } -bool LinuxAsmPrinter::doFinalization(Module &M) { +bool PPCLinuxAsmPrinter::doFinalization(Module &M) { const TargetData TD = TM.getTargetData(); // Print out module-level global variables here. for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I) { if (!I->hasInitializer()) continue; // External global require no code - + // Check to see if this is a special global used by LLVM, if so, emit it. if (EmitSpecialLLVMGlobal(I)) continue; @@ -673,7 +673,7 @@ if (I->hasHiddenVisibility()) if (const char Directive = TAI->getHiddenDirective()) O << Directive << name << "\n"; - + Constant C = I->getInitializer(); unsigned Size = TD->getABITypeSize(C->getType()); unsigned Align = TD->getPreferredAlignmentLog(I); @@ -770,7 +770,7 @@ return AsmPrinter::doFinalization(M); } -std::string LinuxAsmPrinter::getSectionForFunction(const Function &F) const { +std::string PPCLinuxAsmPrinter::getSectionForFunction(const Function &F) const { switch (F.getLinkage()) { default: assert(0 && "Unknown linkage type!"); case Function::ExternalLinkage: @@ -781,7 +781,7 @@ } } -std::string DarwinAsmPrinter::getSectionForFunction(const Function &F) const { +std::string PPCDarwinAsmPrinter::getSectionForFunction(const Function &F) const { switch (F.getLinkage()) { default: assert(0 && "Unknown linkage type!"); case Function::ExternalLinkage: @@ -795,7 +795,7 @@ /// runOnMachineFunction - This uses the printMachineInstruction() /// method to print assembly for each instruction. /// -bool DarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) { +bool PPCDarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) { SetupMachineFunction(MF); O << "\n\n"; @@ -806,7 +806,7 @@ // Print out labels for the function. const Function F = MF.getFunction(); SwitchToTextSection(getSectionForFunction(F).c_str(), F); - + switch (F->getLinkage()) { default: assert(0 && "Unknown linkage type!"); case Function::InternalLinkage: // Symbols default to internal. @@ -820,11 +820,11 @@ O << "\t.weak_definition\t" << CurrentFnName << "\n"; break; } - + if (F->hasHiddenVisibility()) if (const char Directive = TAI->getHiddenDirective()) O << Directive << CurrentFnName << "\n"; - + EmitAlignment(OptimizeForSize ? 2 : 4, F); O << CurrentFnName << ":\n"; @@ -856,16 +856,16 @@ // Print out jump tables referenced by the function. EmitJumpTableInfo(MF.getJumpTableInfo(), MF); - + // Emit post-function debug information. DW.EndFunction(); - + // We didn't modify anything. return false; } -bool DarwinAsmPrinter::doInitialization(Module &M) { +bool PPCDarwinAsmPrinter::doInitialization(Module &M) { static const char const CPUDirectives[] = { "", "ppc", @@ -887,9 +887,9 @@ Directive = PPC::DIR_64; assert(Directive <= PPC::DIR_64 && "Directive out of range."); O << "\t.machine " << CPUDirectives[Directive] << "\n"; - + bool Result = AsmPrinter::doInitialization(M); - + // Emit initial debug information. DW.BeginModule(&M); @@ -901,7 +901,7 @@ // Darwin wants symbols to be quoted if they have complex names. Mang->setUseQuotes(true); - + // Prime text sections so they are adjacent. This reduces the likelihood a // large data or debug section causes a branch to exceed 16M limit. SwitchToTextSection("\t.section __TEXT,__textcoal_nt,coalesced," @@ -914,18 +914,18 @@ "pure_instructions,16"); } SwitchToTextSection(TAI->getTextSection()); - + return Result; } -bool DarwinAsmPrinter::doFinalization(Module &M) { +bool PPCDarwinAsmPrinter::doFinalization(Module &M) { const TargetData TD = TM.getTargetData(); // Print out module-level global variables here. for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); I != E; ++I) { if (!I->hasInitializer()) continue; // External global require no code - + // Check to see if this is a special global used by LLVM, if so, emit it. if (EmitSpecialLLVMGlobal(I)) { if (TM.getRelocationModel() == Reloc::Static) { @@ -936,13 +936,13 @@ } continue; } - + std::string name = Mang->getValueName(I); - + if (I->hasHiddenVisibility()) if (const char Directive = TAI->getHiddenDirective()) O << Directive << name << "\n"; - + Constant C = I->getInitializer(); const Type Type = C->getType(); unsigned Size = TD->getABITypeSize(Type); @@ -1156,7 +1156,6 @@ O << "\t.quad\t0\n"; else O << "\t.long\t0\n"; - } } @@ -1184,9 +1183,8 @@ const PPCSubtarget Subtarget = &tm.getSubtarget(); if (Subtarget->isDarwin()) { - return new DarwinAsmPrinter(o, tm, tm.getTargetAsmInfo()); + return new PPCDarwinAsmPrinter(o, tm, tm.getTargetAsmInfo()); } else { - return new LinuxAsmPrinter(o, tm, tm.getTargetAsmInfo()); + return new PPCLinuxAsmPrinter(o, tm, tm.getTargetAsmInfo()); } } - From asl at math.spbu.ru Fri Aug 8 13:23:25 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 18:23:25 -0000 Subject: [llvm-commits] [llvm] r54537 - in /llvm/trunk/lib/Target/PowerPC: PPCAsmPrinter.cpp PPCTargetAsmInfo.cpp PPCTargetAsmInfo.h Message-ID: <200808081823.m78INPCH009515@zion.cs.uiuc.edu> Author: asl Date: Fri Aug 8 13:23:25 2008 New Revision: 54537 URL: http://llvm.org/viewvc/llvm-project?rev=54537&view=rev Log: Switch PPC/Darwin to new section handling stuff Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54537&r1=54536&r2=54537&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug 8 13:23:25 2008 @@ -348,6 +348,7 @@ /// getSectionForFunction - Return the section that we should emit the /// specified function body into. virtual std::string getSectionForFunction(const Function &F) const; + void printModuleLevelGV(const GlobalVariable GVar); }; } // end of anonymous namespace @@ -771,25 +772,11 @@ } std::string PPCLinuxAsmPrinter::getSectionForFunction(const Function &F) const { - switch (F.getLinkage()) { - default: assert(0 && "Unknown linkage type!"); - case Function::ExternalLinkage: - case Function::InternalLinkage: return TAI->getTextSection(); - case Function::WeakLinkage: - case Function::LinkOnceLinkage: - return ".text"; - } + return TAI->SectionForGlobal(&F); } std::string PPCDarwinAsmPrinter::getSectionForFunction(const Function &F) const { - switch (F.getLinkage()) { - default: assert(0 && "Unknown linkage type!"); - case Function::ExternalLinkage: - case Function::InternalLinkage: return TAI->getTextSection(); - case Function::WeakLinkage: - case Function::LinkOnceLinkage: - return "\t.section __TEXT,__textcoal_nt,coalesced,pure_instructions"; - } + return TAI->SectionForGlobal(&F); } /// runOnMachineFunction - This uses the printMachineInstruction() @@ -918,147 +905,113 @@ return Result; } -bool PPCDarwinAsmPrinter::doFinalization(Module &M) { +void PPCDarwinAsmPrinter::printModuleLevelGV(const GlobalVariable* GVar) { const TargetData TD = TM.getTargetData(); - // Print out module-level global variables here. - for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); - I != E; ++I) { - if (!I->hasInitializer()) continue; // External global require no code + if (!GVar->hasInitializer()) + return; // External global require no code - // Check to see if this is a special global used by LLVM, if so, emit it. - if (EmitSpecialLLVMGlobal(I)) { - if (TM.getRelocationModel() == Reloc::Static) { - if (I->getName() == "llvm.global_ctors") - O << ".reference .constructors_used\n"; - else if (I->getName() == "llvm.global_dtors") - O << ".reference .destructors_used\n"; - } - continue; + // Check to see if this is a special global used by LLVM, if so, emit it. + if (EmitSpecialLLVMGlobal(GVar)) { + if (TM.getRelocationModel() == Reloc::Static) { + if (GVar->getName() == "llvm.global_ctors") + O << ".reference .constructors_used\n"; + else if (GVar->getName() == "llvm.global_dtors") + O << ".reference .destructors_used\n"; } + return; + } - std::string name = Mang->getValueName(I); - - if (I->hasHiddenVisibility()) - if (const char Directive = TAI->getHiddenDirective()) - O << Directive << name << "\n"; + std::string name = Mang->getValueName(GVar); + std::string SectionName = TAI->SectionForGlobal(GVar); - Constant C = I->getInitializer(); - const Type Type = C->getType(); - unsigned Size = TD->getABITypeSize(Type); - unsigned Align = TD->getPreferredAlignmentLog(I); + if (GVar->hasHiddenVisibility()) + if (const char Directive = TAI->getHiddenDirective()) + O << Directive << name << "\n"; - if (C->isNullValue() && / FIXME: Verify correct / - !I->hasSection() && (I->hasCommonLinkage() \|\| - I->hasInternalLinkage() \|\| I->hasWeakLinkage() \|\| - I->hasLinkOnceLinkage() \|\| I->hasExternalLinkage())) { - if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. - if (I->hasExternalLinkage()) { - O << "\t.globl " << name << '\n'; - O << "\t.zerofill __DATA, __common, " << name << ", " - << Size << ", " << Align; - } else if (I->hasInternalLinkage()) { - SwitchToDataSection("\t.data", I); - O << TAI->getLCOMMDirective() << name << "," << Size << "," << Align; - } else if (!I->hasCommonLinkage()) { - O << "\t.globl " << name << "\n" - << TAI->getWeakDefDirective() << name << "\n"; - SwitchToDataSection("\t.section __DATA,__datacoal_nt,coalesced", I); - EmitAlignment(Align, I); - O << name << ":\t\t\t\t" << TAI->getCommentString() << " "; - PrintUnmangledNameSafely(I, O); - O << "\n"; - EmitGlobalConstant(C); - continue; - } else { - SwitchToDataSection("\t.data", I); - O << ".comm " << name << "," << Size; - // Darwin 9 and above support aligned common data. - if (Subtarget.isDarwin9()) - O << "," << Align; - } - O << "\t\t" << TAI->getCommentString() << " '"; - PrintUnmangledNameSafely(I, O); - O << "'\n"; + Constant C = GVar->getInitializer(); + const Type Type = C->getType(); + unsigned Size = TD->getABITypeSize(Type); + unsigned Align = TD->getPreferredAlignmentLog(GVar); + + SwitchToDataSection(SectionName.c_str()); + + if (C->isNullValue() && / FIXME: Verify correct / + !GVar->hasSection() && + (GVar->hasInternalLinkage() \|\| GVar->hasExternalLinkage() \|\| + GVar->isWeakForLinker())) { + if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. + + if (GVar->hasExternalLinkage()) { + O << "\t.globl " << name << '\n'; + O << "\t.zerofill __DATA, __common, " << name << ", " + << Size << ", " << Align; + } else if (GVar->hasInternalLinkage()) { + O << TAI->getLCOMMDirective() << name << "," << Size << "," << Align; + } else if (!GVar->hasCommonLinkage()) { + O << "\t.globl " << name << "\n" + << TAI->getWeakDefDirective() << name << "\n"; + EmitAlignment(Align, GVar); + O << name << ":\t\t\t\t" << TAI->getCommentString() << " "; + PrintUnmangledNameSafely(GVar, O); + O << "\n"; + EmitGlobalConstant(C); + return; } else { - switch (I->getLinkage()) { - case GlobalValue::LinkOnceLinkage: - case GlobalValue::WeakLinkage: - case GlobalValue::CommonLinkage: - O << "\t.globl " << name << '\n' - << "\t.weak_definition " << name << '\n'; - if (!I->isConstant()) - SwitchToDataSection("\t.section __DATA,__datacoal_nt,coalesced", I); - else { - const ArrayType AT = dyn_cast(Type); - if (AT && AT->getElementType()==Type::Int8Ty) - SwitchToDataSection("\t.section __TEXT,__const_coal,coalesced", I); - else - SwitchToDataSection("\t.section __DATA,__const_coal,coalesced", I); - } - break; - case GlobalValue::AppendingLinkage: - // FIXME: appending linkage variables should go into a section of - // their name or something. For now, just emit them as external. - case GlobalValue::ExternalLinkage: - // If external or appending, declare as a global symbol - O << "\t.globl " << name << "\n"; - // FALL THROUGH - case GlobalValue::InternalLinkage: - if (I->isConstant()) { - const ConstantArray CVA = dyn_cast(C); - if (TAI->getCStringSection() && CVA && CVA->isCString()) { - SwitchToDataSection(TAI->getCStringSection(), I); - break; - } - } - if (I->hasSection()) { - // Honor all section names on Darwin; ObjC uses this - std::string SectionName = ".section " + I->getSection(); - SwitchToDataSection(SectionName.c_str()); - } else if (!I->isConstant()) - SwitchToDataSection(TAI->getDataSection(), I); - else { - // Read-only data. - bool HasReloc = C->ContainsRelocations(); - if (HasReloc && - TM.getRelocationModel() != Reloc::Static) - SwitchToDataSection("\t.const_data\n"); - else if (!HasReloc && Size == 4 && - TAI->getFourByteConstantSection()) - SwitchToDataSection(TAI->getFourByteConstantSection(), I); - else if (!HasReloc && Size == 8 && - TAI->getEightByteConstantSection()) - SwitchToDataSection(TAI->getEightByteConstantSection(), I); - else if (!HasReloc && Size == 16 && - TAI->getSixteenByteConstantSection()) - SwitchToDataSection(TAI->getSixteenByteConstantSection(), I); - else if (TAI->getReadOnlySection()) - SwitchToDataSection(TAI->getReadOnlySection(), I); - else - SwitchToDataSection(TAI->getDataSection(), I); - } - break; - default: - cerr << "Unknown linkage type!"; - abort(); - } + O << ".comm " << name << "," << Size; + // Darwin 9 and above support aligned common data. + if (Subtarget.isDarwin9()) + O << "," << Align; + } + O << "\t\t" << TAI->getCommentString() << " '"; + PrintUnmangledNameSafely(GVar, O); + O << "'\n"; + return; + } - EmitAlignment(Align, I); - O << name << ":\t\t\t\t" << TAI->getCommentString() << " '"; - PrintUnmangledNameSafely(I, O); - O << "'\n"; + switch (GVar->getLinkage()) { + case GlobalValue::LinkOnceLinkage: + case GlobalValue::WeakLinkage: + case GlobalValue::CommonLinkage: + O << "\t.globl " << name << '\n' + << "\t.weak_definition " << name << '\n'; + break; + case GlobalValue::AppendingLinkage: + // FIXME: appending linkage variables should go into a section of + // their name or something. For now, just emit them as external. + case GlobalValue::ExternalLinkage: + // If external or appending, declare as a global symbol + O << "\t.globl " << name << "\n"; + // FALL THROUGH + case GlobalValue::InternalLinkage: + break; + default: + cerr << "Unknown linkage type!"; + abort(); + } - // If the initializer is a extern weak symbol, remember to emit the weak - // reference! - if (const GlobalValue GV = dyn_cast(C)) - if (GV->hasExternalWeakLinkage()) - ExtWeakSymbols.insert(GV); + EmitAlignment(Align, GVar); + O << name << ":\t\t\t\t" << TAI->getCommentString() << " '"; + PrintUnmangledNameSafely(GVar, O); + O << "'\n"; + + // If the initializer is a extern weak symbol, remember to emit the weak + // reference! + if (const GlobalValue GV = dyn_cast(C)) + if (GV->hasExternalWeakLinkage()) + ExtWeakSymbols.insert(GV); - EmitGlobalConstant(C); - O << '\n'; - } - } + EmitGlobalConstant(C); + O << '\n'; +} + +bool PPCDarwinAsmPrinter::doFinalization(Module &M) { + const TargetData TD = TM.getTargetData(); + + // Print out module-level global variables here. + for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); + I != E; ++I) + printModuleLevelGV(I); bool isPPC64 = TD->getPointerSizeInBits() == 64; Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp?rev=54537&r1=54536&r2=54537&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Fri Aug 8 13:23:25 2008 @@ -21,7 +21,7 @@ PPCTargetAsmInfo::PPCTargetAsmInfo(const PPCTargetMachine &TM) { bool isPPC64 = TM.getSubtargetImpl()->isPPC64(); - + ZeroDirective = "\t.space\t"; SetDirective = "\t.set"; Data64bitsDirective = isPPC64 ? "\t.quad\t" : 0; @@ -32,9 +32,8 @@ AssemblerDialect = TM.getSubtargetImpl()->getAsmFlavor(); } -PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM) -: PPCTargetAsmInfo(TM) -{ +PPCDarwinTargetAsmInfo::PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM): + PPCTargetAsmInfo(TM), DarwinTargetAsmInfo(TM) { PCSymbol = "."; CommentString = ";"; GlobalPrefix = "_"; Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h?rev=54537&r1=54536&r2=54537&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original) +++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Fri Aug 8 13:23:25 2008 @@ -15,17 +15,19 @@ #define PPCTARGETASMINFO_H #include "llvm/Target/TargetAsmInfo.h" +#include "llvm/Target/DarwinTargetAsmInfo.h" namespace llvm { // Forward declaration. class PPCTargetMachine; - - struct PPCTargetAsmInfo : public TargetAsmInfo { + + struct PPCTargetAsmInfo : public virtual TargetAsmInfo { explicit PPCTargetAsmInfo(const PPCTargetMachine &TM); }; - struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo { + struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo, + public DarwinTargetAsmInfo{ explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM); virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason, bool Global) const; From asl at math.spbu.ru Fri Aug 8 13:23:49 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 18:23:49 -0000 Subject: [llvm-commits] [llvm] r54538 - in /llvm/trunk/lib/Target/PowerPC: PPCAsmPrinter.cpp PPCTargetAsmInfo.cpp PPCTargetAsmInfo.h Message-ID: <200808081823.m78INniW009546@zion.cs.uiuc.edu> Author: asl Date: Fri Aug 8 13:23:49 2008 New Revision: 54538 URL: http://llvm.org/viewvc/llvm-project?rev=54538&view=rev Log: Convert PPC/Linux to new section printing stuff Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54538&r1=54537&r2=54538&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug 8 13:23:49 2008 @@ -317,6 +317,7 @@ /// getSectionForFunction - Return the section that we should emit the /// specified function body into. virtual std::string getSectionForFunction(const Function &F) const; + void printModuleLevelGV(const GlobalVariable* GVar); }; /// PPCDarwinAsmPrinter - PowerPC assembly printer, customized for Darwin/Mac @@ -657,111 +658,95 @@ OS << Name; } -bool PPCLinuxAsmPrinter::doFinalization(Module &M) { +void PPCLinuxAsmPrinter::printModuleLevelGV(const GlobalVariable GVar) { const TargetData TD = TM.getTargetData(); - // Print out module-level global variables here. - for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); - I != E; ++I) { - if (!I->hasInitializer()) continue; // External global require no code + if (!GVar->hasInitializer()) + return; // External global require no code + + // Check to see if this is a special global used by LLVM, if so, emit it. + if (EmitSpecialLLVMGlobal(GVar)) + return; - // Check to see if this is a special global used by LLVM, if so, emit it. - if (EmitSpecialLLVMGlobal(I)) - continue; - - std::string name = Mang->getValueName(I); - - if (I->hasHiddenVisibility()) - if (const char Directive = TAI->getHiddenDirective()) - O << Directive << name << "\n"; - - Constant C = I->getInitializer(); - unsigned Size = TD->getABITypeSize(C->getType()); - unsigned Align = TD->getPreferredAlignmentLog(I); - - if (C->isNullValue() && / FIXME: Verify correct / - !I->hasSection() && (I->hasCommonLinkage() \|\| - I->hasInternalLinkage() \|\| I->hasWeakLinkage() \|\| - I->hasLinkOnceLinkage() \|\| I->hasExternalLinkage())) { + std::string name = Mang->getValueName(GVar); + std::string SectionName = TAI->SectionForGlobal(GVar); + + if (GVar->hasHiddenVisibility()) + if (const char Directive = TAI->getHiddenDirective()) + O << Directive << name << "\n"; + + Constant C = GVar->getInitializer(); + const Type Type = C->getType(); + unsigned Size = TD->getABITypeSize(Type); + unsigned Align = TD->getPreferredAlignmentLog(GVar); + + SwitchToDataSection(SectionName.c_str()); + + if (C->isNullValue() && /* FIXME: Verify correct / + !GVar->hasSection() && + (GVar->hasInternalLinkage() \|\| GVar->hasExternalLinkage() \|\| + GVar->isWeakForLinker())) { if (Size == 0) Size = 1; // .comm Foo, 0 is undefined, avoid it. - if (I->hasExternalLinkage()) { + + if (GVar->hasExternalLinkage()) { O << "\t.global " << name << '\n'; O << "\t.type " << name << ", @object\n"; - if (TAI->getBSSSection()) - SwitchToDataSection(TAI->getBSSSection(), I); O << name << ":\n"; O << "\t.zero " << Size << "\n"; - } else if (I->hasInternalLinkage()) { - SwitchToDataSection("\t.data", I); + } else if (GVar->hasInternalLinkage()) { O << TAI->getLCOMMDirective() << name << "," << Size; } else { - SwitchToDataSection("\t.data", I); O << ".comm " << name << "," << Size; } O << "\t\t" << TAI->getCommentString() << " '"; - PrintUnmangledNameSafely(I, O); + PrintUnmangledNameSafely(GVar, O); O << "'\n"; - } else { - switch (I->getLinkage()) { - case GlobalValue::LinkOnceLinkage: - case GlobalValue::WeakLinkage: - case GlobalValue::CommonLinkage: - O << "\t.global " << name << '\n' - << "\t.type " << name << ", @object\n" - << "\t.weak " << name << '\n'; - SwitchToDataSection("\t.data", I); - break; - case GlobalValue::AppendingLinkage: - // FIXME: appending linkage variables should go into a section of - // their name or something. For now, just emit them as external. - case GlobalValue::ExternalLinkage: - // If external or appending, declare as a global symbol - O << "\t.global " << name << "\n" - << "\t.type " << name << ", @object\n"; - // FALL THROUGH - case GlobalValue::InternalLinkage: - if (I->isConstant()) { - const ConstantArray CVA = dyn_cast(C); - if (TAI->getCStringSection() && CVA && CVA->isCString()) { - SwitchToDataSection(TAI->getCStringSection(), I); - break; - } - } - - // FIXME: special handling for ".ctors" & ".dtors" sections - if (I->hasSection() && - (I->getSection() == ".ctors" \|\| - I->getSection() == ".dtors")) { - std::string SectionName = ".section " + I->getSection() - + ",\"aw\", at progbits"; - SwitchToDataSection(SectionName.c_str()); - } else { - if (I->isConstant() && TAI->getReadOnlySection()) - SwitchToDataSection(TAI->getReadOnlySection(), I); - else - SwitchToDataSection(TAI->getDataSection(), I); - } - break; - default: - cerr << "Unknown linkage type!"; - abort(); - } + return; + } - EmitAlignment(Align, I); - O << name << ":\t\t\t\t" << TAI->getCommentString() << " '"; - PrintUnmangledNameSafely(I, O); - O << "'\n"; + switch (GVar->getLinkage()) { + case GlobalValue::LinkOnceLinkage: + case GlobalValue::WeakLinkage: + case GlobalValue::CommonLinkage: + O << "\t.global " << name << '\n' + << "\t.type " << name << ", @object\n" + << "\t.weak " << name << '\n'; + break; + case GlobalValue::AppendingLinkage: + // FIXME: appending linkage variables should go into a section of + // their name or something. For now, just emit them as external. + case GlobalValue::ExternalLinkage: + // If external or appending, declare as a global symbol + O << "\t.global " << name << "\n" + << "\t.type " << name << ", @object\n"; + // FALL THROUGH + case GlobalValue::InternalLinkage: + break; + default: + cerr << "Unknown linkage type!"; + abort(); + } - // If the initializer is a extern weak symbol, remember to emit the weak - // reference! - if (const GlobalValue GV = dyn_cast(C)) - if (GV->hasExternalWeakLinkage()) - ExtWeakSymbols.insert(GV); + EmitAlignment(Align, GVar); + O << name << ":\t\t\t\t" << TAI->getCommentString() << " '"; + PrintUnmangledNameSafely(GVar, O); + O << "'\n"; - EmitGlobalConstant(C); - O << '\n'; - } - } + // If the initializer is a extern weak symbol, remember to emit the weak + // reference! + if (const GlobalValue GV = dyn_cast(C)) + if (GV->hasExternalWeakLinkage()) + ExtWeakSymbols.insert(GV); + + EmitGlobalConstant(C); + O << '\n'; +} + +bool PPCLinuxAsmPrinter::doFinalization(Module &M) { + // Print out module-level global variables here. + for (Module::const_global_iterator I = M.global_begin(), E = M.global_end(); + I != E; ++I) + printModuleLevelGV(I); // TODO @@ -783,7 +768,6 @@ /// method to print assembly for each instruction. /// bool PPCDarwinAsmPrinter::runOnMachineFunction(MachineFunction &MF) { - SetupMachineFunction(MF); O << "\n\n"; Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp?rev=54538&r1=54537&r2=54538&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.cpp Fri Aug 8 13:23:49 2008 @@ -104,9 +104,8 @@ } -PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM) -: PPCTargetAsmInfo(TM) -{ +PPCLinuxTargetAsmInfo::PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM) : + PPCTargetAsmInfo(TM), ELFTargetAsmInfo(TM) { CommentString = "#"; GlobalPrefix = ""; PrivateGlobalPrefix = ""; Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h?rev=54538&r1=54537&r2=54538&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h (original) +++ llvm/trunk/lib/Target/PowerPC/PPCTargetAsmInfo.h Fri Aug 8 13:23:49 2008 @@ -16,6 +16,7 @@ #include "llvm/Target/TargetAsmInfo.h" #include "llvm/Target/DarwinTargetAsmInfo.h" +#include "llvm/Target/ELFTargetAsmInfo.h" namespace llvm { @@ -27,13 +28,14 @@ }; struct PPCDarwinTargetAsmInfo : public PPCTargetAsmInfo, - public DarwinTargetAsmInfo{ + public DarwinTargetAsmInfo { explicit PPCDarwinTargetAsmInfo(const PPCTargetMachine &TM); virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason, bool Global) const; }; - struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo { + struct PPCLinuxTargetAsmInfo : public PPCTargetAsmInfo, + public ELFTargetAsmInfo { explicit PPCLinuxTargetAsmInfo(const PPCTargetMachine &TM); virtual unsigned PreferredEHDataFormat(DwarfEncoding::Target Reason, bool Global) const; From asl at math.spbu.ru Fri Aug 8 13:24:10 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 18:24:10 -0000 Subject: [llvm-commits] [llvm] r54539 - /llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Message-ID: <200808081824.m78IOAB4009566@zion.cs.uiuc.edu> Author: asl Date: Fri Aug 8 13:24:10 2008 New Revision: 54539 URL: http://llvm.org/viewvc/llvm-project?rev=54539&view=rev Log: Use chars, where possible Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54539&r1=54538&r2=54539&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug 8 13:24:10 2008 @@ -529,7 +529,7 @@ printOperand(MI, 0); O << ", "; printOperand(MI, 1); - O << ", " << (unsigned int)SH << "\n"; + O << ", " << (unsigned int)SH << '\n'; return; } } else if (MI->getOpcode() == PPC::OR \|\| MI->getOpcode() == PPC::OR8) { @@ -538,7 +538,7 @@ printOperand(MI, 0); O << ", "; printOperand(MI, 1); - O << "\n"; + O << '\n'; return; } } else if (MI->getOpcode() == PPC::RLDICR) { @@ -550,7 +550,7 @@ printOperand(MI, 0); O << ", "; printOperand(MI, 1); - O << ", " << (unsigned int)SH << "\n"; + O << ", " << (unsigned int)SH << '\n'; return; } } @@ -595,7 +595,7 @@ if (F->hasHiddenVisibility()) if (const char Directive = TAI->getHiddenDirective()) - O << Directive << CurrentFnName << "\n"; + O << Directive << CurrentFnName << '\n'; EmitAlignment(2, F); O << CurrentFnName << ":\n"; @@ -618,7 +618,7 @@ } } - O << "\t.size\t" << CurrentFnName << ",.-" << CurrentFnName << "\n"; + O << "\t.size\t" << CurrentFnName << ",.-" << CurrentFnName << '\n'; // Print out jump tables referenced by the function. EmitJumpTableInfo(MF.getJumpTableInfo(), MF); @@ -673,7 +673,7 @@ if (GVar->hasHiddenVisibility()) if (const char Directive = TAI->getHiddenDirective()) - O << Directive << name << "\n"; + O << Directive << name << '\n'; Constant C = GVar->getInitializer(); const Type Type = C->getType(); @@ -692,11 +692,11 @@ O << "\t.global " << name << '\n'; O << "\t.type " << name << ", @object\n"; O << name << ":\n"; - O << "\t.zero " << Size << "\n"; + O << "\t.zero " << Size << '\n'; } else if (GVar->hasInternalLinkage()) { - O << TAI->getLCOMMDirective() << name << "," << Size; + O << TAI->getLCOMMDirective() << name << ',' << Size; } else { - O << ".comm " << name << "," << Size; + O << ".comm " << name << ',' << Size; } O << "\t\t" << TAI->getCommentString() << " '"; PrintUnmangledNameSafely(GVar, O); @@ -717,7 +717,7 @@ // their name or something. For now, just emit them as external. case GlobalValue::ExternalLinkage: // If external or appending, declare as a global symbol - O << "\t.global " << name << "\n" + O << "\t.global " << name << '\n' << "\t.type " << name << ", @object\n"; // FALL THROUGH case GlobalValue::InternalLinkage: @@ -783,18 +783,18 @@ case Function::InternalLinkage: // Symbols default to internal. break; case Function::ExternalLinkage: - O << "\t.globl\t" << CurrentFnName << "\n"; + O << "\t.globl\t" << CurrentFnName << '\n'; break; case Function::WeakLinkage: case Function::LinkOnceLinkage: - O << "\t.globl\t" << CurrentFnName << "\n"; - O << "\t.weak_definition\t" << CurrentFnName << "\n"; + O << "\t.globl\t" << CurrentFnName << '\n'; + O << "\t.weak_definition\t" << CurrentFnName << '\n'; break; } if (F->hasHiddenVisibility()) if (const char Directive = TAI->getHiddenDirective()) - O << Directive << CurrentFnName << "\n"; + O << Directive << CurrentFnName << '\n'; EmitAlignment(OptimizeForSize ? 2 : 4, F); O << CurrentFnName << ":\n"; @@ -857,7 +857,7 @@ if (Subtarget.isPPC64() && Directive < PPC::DIR_970) Directive = PPC::DIR_64; assert(Directive <= PPC::DIR_64 && "Directive out of range."); - O << "\t.machine " << CPUDirectives[Directive] << "\n"; + O << "\t.machine " << CPUDirectives[Directive] << '\n'; bool Result = AsmPrinter::doInitialization(M); @@ -911,7 +911,7 @@ if (GVar->hasHiddenVisibility()) if (const char Directive = TAI->getHiddenDirective()) - O << Directive << name << "\n"; + O << Directive << name << '\n'; Constant C = GVar->getInitializer(); const Type Type = C->getType(); @@ -931,21 +931,21 @@ O << "\t.zerofill __DATA, __common, " << name << ", " << Size << ", " << Align; } else if (GVar->hasInternalLinkage()) { - O << TAI->getLCOMMDirective() << name << "," << Size << "," << Align; + O << TAI->getLCOMMDirective() << name << ',' << Size << ',' << Align; } else if (!GVar->hasCommonLinkage()) { - O << "\t.globl " << name << "\n" - << TAI->getWeakDefDirective() << name << "\n"; + O << "\t.globl " << name << '\n' + << TAI->getWeakDefDirective() << name << '\n'; EmitAlignment(Align, GVar); O << name << ":\t\t\t\t" << TAI->getCommentString() << " "; PrintUnmangledNameSafely(GVar, O); - O << "\n"; + O << '\n'; EmitGlobalConstant(C); return; } else { - O << ".comm " << name << "," << Size; + O << ".comm " << name << ',' << Size; // Darwin 9 and above support aligned common data. if (Subtarget.isDarwin9()) - O << "," << Align; + O << ',' << Align; } O << "\t\t" << TAI->getCommentString() << " '"; PrintUnmangledNameSafely(GVar, O); @@ -965,7 +965,7 @@ // their name or something. For now, just emit them as external. case GlobalValue::ExternalLinkage: // If external or appending, declare as a global symbol - O << "\t.globl " << name << "\n"; + O << "\t.globl " << name << '\n'; // FALL THROUGH case GlobalValue::InternalLinkage: break; @@ -1010,9 +1010,9 @@ std::string L0p = (p[0]=='\"') ? "\"L0$" + p.substr(1) : "L0$" + p ; printSuffixedName(p, "$stub"); O << ":\n"; - O << "\t.indirect_symbol " << i << "\n"; + O << "\t.indirect_symbol " << i << '\n'; O << "\tmflr r0\n"; - O << "\tbcl 20,31," << L0p << "\n"; + O << "\tbcl 20,31," << L0p << '\n'; O << L0p << ":\n"; O << "\tmflr r11\n"; O << "\taddis r11,r11,ha16("; @@ -1030,7 +1030,7 @@ SwitchToDataSection(".lazy_symbol_pointer"); printSuffixedName(p, "$lazy_ptr"); O << ":\n"; - O << "\t.indirect_symbol " << i << "\n"; + O << "\t.indirect_symbol " << i << '\n'; if (isPPC64) O << "\t.quad dyld_stub_binding_helper\n"; else @@ -1045,7 +1045,7 @@ std::string p = i; printSuffixedName(p, "$stub"); O << ":\n"; - O << "\t.indirect_symbol " << i << "\n"; + O << "\t.indirect_symbol " << i << '\n'; O << "\tlis r11,ha16("; printSuffixedName(p, "$lazy_ptr"); O << ")\n"; @@ -1060,7 +1060,7 @@ SwitchToDataSection(".lazy_symbol_pointer"); printSuffixedName(p, "$lazy_ptr"); O << ":\n"; - O << "\t.indirect_symbol " << i << "\n"; + O << "\t.indirect_symbol " << i << '\n'; if (isPPC64) O << "\t.quad dyld_stub_binding_helper\n"; else @@ -1068,7 +1068,7 @@ } } - O << "\n"; + O << '\n'; if (TAI->doesSupportExceptionHandling() && MMI) { // Add the (possibly multiple) personalities to the set of global values. @@ -1088,7 +1088,7 @@ std::string p = I; printSuffixedName(p, "$non_lazy_ptr"); O << ":\n"; - O << "\t.indirect_symbol " << I << "\n"; + O << "\t.indirect_symbol " << I << '\n'; if (isPPC64) O << "\t.quad\t0\n"; else From asl at math.spbu.ru Fri Aug 8 13:25:07 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 18:25:07 -0000 Subject: [llvm-commits] [llvm] r54540 - in /llvm/trunk: include/llvm/CodeGen/AsmPrinter.h lib/CodeGen/AsmPrinter.cpp lib/Target/ARM/ARMAsmPrinter.cpp lib/Target/Alpha/AlphaAsmPrinter.cpp lib/Target/IA64/IA64AsmPrinter.cpp lib/Target/Mips/MipsAsmPrinter.cpp lib/Target/PowerPC/PPCAsmPrinter.cpp lib/Target/Sparc/SparcAsmPrinter.cpp lib/Target/X86/X86ATTAsmPrinter.cpp Message-ID: <200808081825.m78IP7WO009633@zion.cs.uiuc.edu> Author: asl Date: Fri Aug 8 13:25:07 2008 New Revision: 54540 URL: http://llvm.org/viewvc/llvm-project?rev=54540&view=rev Log: Handle visibility printing with all generality. Remove bunch of duplicate code. Modified: llvm/trunk/include/llvm/CodeGen/AsmPrinter.h llvm/trunk/lib/CodeGen/AsmPrinter.cpp llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Modified: llvm/trunk/include/llvm/CodeGen/AsmPrinter.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/AsmPrinter.h?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/include/llvm/CodeGen/AsmPrinter.h (original) +++ llvm/trunk/include/llvm/CodeGen/AsmPrinter.h Fri Aug 8 13:25:07 2008 @@ -355,6 +355,10 @@ const char Prefix = 0); void printSuffixedName(const std::string &Name, const char Suffix); + /// printVisibility - This prints visibility information about symbol, if + /// this is suported by the target. + void printVisibility(const std::string& Name, unsigned Visibility) const; + private: void EmitLLVMUsedList(Constant List); void EmitXXStructorList(Constant List); Modified: llvm/trunk/lib/CodeGen/AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/AsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/AsmPrinter.cpp (original) +++ llvm/trunk/lib/CodeGen/AsmPrinter.cpp Fri Aug 8 13:25:07 2008 @@ -1469,3 +1469,14 @@ void AsmPrinter::printSuffixedName(const std::string &Name, const char* Suffix) { printSuffixedName(Name.c_str(), Suffix); } + +void AsmPrinter::printVisibility(const std::string& Name, + unsigned Visibility) const { + if (Visibility == GlobalValue::HiddenVisibility) { + if (const char Directive = TAI->getHiddenDirective()) + O << Directive << Name << '\n'; + } else if (Visibility == GlobalValue::ProtectedVisibility) { + if (const char Directive = TAI->getProtectedDirective()) + O << Directive << Name << '\n'; + } +} Modified: llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/ARM/ARMAsmPrinter.cpp Fri Aug 8 13:25:07 2008 @@ -226,14 +226,7 @@ break; } - const char VisibilityDirective = NULL; - if (F->hasHiddenVisibility()) - VisibilityDirective = TAI->getHiddenDirective(); - else if (F->hasProtectedVisibility()) - VisibilityDirective = TAI->getProtectedDirective(); - - if (VisibilityDirective) - O << VisibilityDirective << CurrentFnName << "\n"; + printVisibility(CurrentFnName, F->getVisibility()); if (AFI->isThumbFunction()) { EmitAlignment(1, F, AFI->getAlign()); @@ -870,14 +863,7 @@ unsigned Size = TD->getABITypeSize(Type); unsigned Align = TD->getPreferredAlignmentLog(GVar); - const char VisibilityDirective = NULL; - if (GVar->hasHiddenVisibility()) - VisibilityDirective = TAI->getHiddenDirective(); - else if (GVar->hasProtectedVisibility()) - VisibilityDirective = TAI->getProtectedDirective(); - - if (VisibilityDirective) - O << VisibilityDirective << name << "\n"; + printVisibility(name, GVar->getVisibility()); if (Subtarget->isTargetELF()) O << "\t.type " << name << ",%object\n"; Modified: llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Alpha/AlphaAsmPrinter.cpp Fri Aug 8 13:25:07 2008 @@ -164,6 +164,8 @@ break; } + printVisibility(CurrentFnName, F->getVisibility()); + O << "\t.ent " << CurrentFnName << "\n"; O << CurrentFnName << ":\n"; @@ -221,8 +223,7 @@ SwitchToDataSection(SectionName.c_str()); // 1: Check visibility - if (GVar->hasHiddenVisibility()) - O << TAI->getHiddenDirective() << name << "\n"; + printVisibility(name, GVar->getVisibility()); // 2: Kind switch (GVar->getLinkage()) { Modified: llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/IA64/IA64AsmPrinter.cpp Fri Aug 8 13:25:07 2008 @@ -142,6 +142,9 @@ // Print out labels for the function. EmitAlignment(5); O << "\t.global\t" << CurrentFnName << '\n'; + + printVisibility(CurrentFnName, F->getVisibility()); + O << "\t.type\t" << CurrentFnName << ", @function\n"; O << CurrentFnName << ":\n"; @@ -274,7 +277,7 @@ unsigned Size = TD->getABITypeSize(C->getType()); unsigned Align = TD->getPreferredAlignmentLog(GVar); - // FIXME: ELF supports visibility + printVisibility(name, GVar->getVisibility()); SwitchToDataSection(SectionName.c_str()); Modified: llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Mips/MipsAsmPrinter.cpp Fri Aug 8 13:25:07 2008 @@ -237,6 +237,8 @@ O << "\t.globl\t" << CurrentFnName << '\n'; O << "\t.ent\t" << CurrentFnName << '\n'; + printVisibility(CurrentFnName, F->getVisibility()); + if ((TAI->hasDotTypeDotSizeDirective()) && Subtarget->isLinux()) O << "\t.type\t" << CurrentFnName << ", @function\n"; @@ -497,7 +499,7 @@ } else Align = TD->getPreferredTypeAlignmentShift(CTy); - // FIXME: ELF supports visibility + printVisibility(name, GVar->getVisibility()); SwitchToDataSection(SectionName.c_str()); @@ -508,7 +510,7 @@ if (GVar->hasInternalLinkage()) O << "\t.local\t" << name << '\n'; - + O << TAI->getCOMMDirective() << name << ',' << Size; if (TAI->getCOMMDirectiveTakesAlignment()) O << ',' << (1 << Align); Modified: llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/PowerPC/PPCAsmPrinter.cpp Fri Aug 8 13:25:07 2008 @@ -593,9 +593,7 @@ break; } - if (F->hasHiddenVisibility()) - if (const char Directive = TAI->getHiddenDirective()) - O << Directive << CurrentFnName << '\n'; + printVisibility(CurrentFnName, F->getVisibility()); EmitAlignment(2, F); O << CurrentFnName << ":\n"; @@ -671,9 +669,7 @@ std::string name = Mang->getValueName(GVar); std::string SectionName = TAI->SectionForGlobal(GVar); - if (GVar->hasHiddenVisibility()) - if (const char Directive = TAI->getHiddenDirective()) - O << Directive << name << '\n'; + printVisibility(name, GVar->getVisibility()); Constant C = GVar->getInitializer(); const Type Type = C->getType(); @@ -792,9 +788,7 @@ break; } - if (F->hasHiddenVisibility()) - if (const char Directive = TAI->getHiddenDirective()) - O << Directive << CurrentFnName << '\n'; + printVisibility(CurrentFnName, F->getVisibility()); EmitAlignment(OptimizeForSize ? 2 : 4, F); O << CurrentFnName << ":\n"; @@ -909,9 +903,7 @@ std::string name = Mang->getValueName(GVar); std::string SectionName = TAI->SectionForGlobal(GVar); - if (GVar->hasHiddenVisibility()) - if (const char Directive = TAI->getHiddenDirective()) - O << Directive << name << '\n'; + printVisibility(name, GVar->getVisibility()); Constant C = GVar->getInitializer(); const Type Type = C->getType(); Modified: llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcAsmPrinter.cpp Fri Aug 8 13:25:07 2008 @@ -107,6 +107,9 @@ SwitchToTextSection(getSectionForFunction(F).c_str(), F); EmitAlignment(4, F); O << "\t.globl\t" << CurrentFnName << '\n'; + + printVisibility(CurrentFnName, F->getVisibility()); + O << "\t.type\t" << CurrentFnName << ", #function\n"; O << CurrentFnName << ":\n"; @@ -250,7 +253,8 @@ unsigned Size = TD->getABITypeSize(C->getType()); unsigned Align = TD->getPreferredAlignment(GVar); - // FIXME: ELF supports visibility + printVisibility(name, GVar->getVisibility()); + SwitchToDataSection(SectionName.c_str()); if (C->isNullValue() && !GVar->hasSection()) { Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp?rev=54540&r1=54539&r2=54540&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Fri Aug 8 13:25:07 2008 @@ -183,13 +183,8 @@ } break; } - if (F->hasHiddenVisibility()) { - if (const char Directive = TAI->getHiddenDirective()) - O << Directive << CurrentFnName << '\n'; - } else if (F->hasProtectedVisibility()) { - if (const char Directive = TAI->getProtectedDirective()) - O << Directive << CurrentFnName << '\n'; - } + + printVisibility(CurrentFnName, F->getVisibility()); if (Subtarget->isTargetELF()) O << "\t.type\t" << CurrentFnName << ", at function\n"; @@ -773,13 +768,7 @@ unsigned Size = TD->getABITypeSize(Type); unsigned Align = TD->getPreferredAlignmentLog(GVar); - if (GVar->hasHiddenVisibility()) { - if (const char Directive = TAI->getHiddenDirective()) - O << Directive << name << '\n'; - } else if (GVar->hasProtectedVisibility()) { - if (const char Directive = TAI->getProtectedDirective()) - O << Directive << name << '\n'; - } + printVisibility(name, GVar->getVisibility()); if (Subtarget->isTargetELF()) O << "\t.type\t" << name << ", at object\n"; From asl at math.spbu.ru Fri Aug 8 13:25:30 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 18:25:30 -0000 Subject: [llvm-commits] [llvm] r54541 - /llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Message-ID: <200808081825.m78IPUWl009657@zion.cs.uiuc.edu> Author: asl Date: Fri Aug 8 13:25:29 2008 New Revision: 54541 URL: http://llvm.org/viewvc/llvm-project?rev=54541&view=rev Log: Use mergeable strings sections on sparc Modified: llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Modified: llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp?rev=54541&r1=54540&r2=54541&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Fri Aug 8 13:25:29 2008 @@ -24,6 +24,7 @@ CommentString = "!"; ConstantPoolSection = "\t.section \".rodata\",#alloc\n"; COMMDirectiveTakesAlignment = true; + CStringSection=".rodata.str"; } std::string SparcELFTargetAsmInfo::PrintSectionFlags(unsigned flags) const { From asl at math.spbu.ru Fri Aug 8 13:25:52 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 18:25:52 -0000 Subject: [llvm-commits] [llvm] r54542 - in /llvm/trunk/lib/Target/X86: X86ATTAsmPrinter.cpp X86TargetAsmInfo.cpp Message-ID: <200808081825.m78IPrHx009684@zion.cs.uiuc.edu> Author: asl Date: Fri Aug 8 13:25:52 2008 New Revision: 54542 URL: http://llvm.org/viewvc/llvm-project?rev=54542&view=rev Log: Generalize Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Modified: llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp?rev=54542&r1=54541&r2=54542&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp (original) +++ llvm/trunk/lib/Target/X86/X86ATTAsmPrinter.cpp Fri Aug 8 13:25:52 2008 @@ -806,10 +806,8 @@ return; } else { O << TAI->getCOMMDirective() << name << ',' << Size; - - // Leopard and above support aligned common symbols. - if (Subtarget->getDarwinVers() >= 9) - O << ',' << Align; + if (TAI->getCOMMDirectiveTakesAlignment()) + O << ',' << (TAI->getAlignmentIsInBytes() ? (1 << Align) : Align); } } else { if (!Subtarget->isTargetCygMing()) { Modified: llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp?rev=54542&r1=54541&r2=54542&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86TargetAsmInfo.cpp Fri Aug 8 13:25:52 2008 @@ -126,7 +126,8 @@ X86DarwinTargetAsmInfo::X86DarwinTargetAsmInfo(const X86TargetMachine &TM): X86TargetAsmInfo(TM), DarwinTargetAsmInfo(TM) { - bool is64Bit = DTM->getSubtarget().is64Bit(); + const X86Subtarget Subtarget = &DTM->getSubtarget(); + bool is64Bit = Subtarget->is64Bit(); AlignmentIsInBytes = false; TextAlignFillValue = 0x90; @@ -156,7 +157,8 @@ LCOMMDirective = "\t.lcomm\t"; SwitchToSectionDirective = "\t.section "; StringConstantPrefix = "\1LC"; - COMMDirectiveTakesAlignment = false; + // Leopard and above support aligned common symbols. + COMMDirectiveTakesAlignment = (Subtarget->getDarwinVers() >= 9); HasDotTypeDotSizeDirective = false; if (TM.getRelocationModel() == Reloc::Static) { StaticCtorsSection = ".constructor"; From asl at math.spbu.ru Fri Aug 8 13:26:11 2008 From: asl at math.spbu.ru (Anton Korobeynikov) Date: Fri, 08 Aug 2008 18:26:11 -0000 Subject: [llvm-commits] [llvm] r54543 - /llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Message-ID: <200808081826.m78IQB6a009728@zion.cs.uiuc.edu> Author: asl Date: Fri Aug 8 13:26:10 2008 New Revision: 54543 URL: http://llvm.org/viewvc/llvm-project?rev=54543&view=rev Log: Properly print flags on Sparc Modified: llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Modified: llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp?rev=54543&r1=54542&r2=54543&view=diff ============================================================================== --- llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp (original) +++ llvm/trunk/lib/Target/Sparc/SparcTargetAsmInfo.cpp Fri Aug 8 13:26:10 2008 @@ -28,19 +28,18 @@ } std::string SparcELFTargetAsmInfo::PrintSectionFlags(unsigned flags) const { - std::string Flags = ","; - if (flags & SectionFlags::Mergeable) return ELFTargetAsmInfo::PrintSectionFlags(flags); + std::string Flags; if (!(flags & SectionFlags::Debug)) - Flags += "#alloc"; + Flags += ",#alloc"; if (flags & SectionFlags::Code) - Flags += "#execinstr"; + Flags += ",#execinstr"; if (flags & SectionFlags::Writeable) - Flags += "#write"; + Flags += ",#write"; if (flags & SectionFlags::TLS) - Flags += "#tls"; + Flags += ",#tls"; return Flags; } From gohman at apple.com Fri Aug 8 13:30:21 2008 From: gohman at apple.com (Dan Gohman) Date: Fri, 08 Aug 2008 18:30:21 -0000 Subject: [llvm-commits] [llvm] r54544 - in /llvm/trunk: lib/Target/X86/X86InstrInfo.cpp lib/Target/X86/X86InstrSSE.td test/CodeGen/X86/extractps.ll Message-ID: <200808081830.m78IULQB009898@zion.cs.uiuc.edu> Author: djg Date: Fri Aug 8 13:30:21 2008 New Revision: 54544 URL: http://llvm.org/viewvc/llvm-project?rev=54544&view=rev Log: Add an EXTRACTPSmr pattern to match the pattern that X86ISelLowering creates. Added: llvm/trunk/test/CodeGen/X86/extractps.ll Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp llvm/trunk/lib/Target/X86/X86InstrSSE.td Modified: llvm/trunk/lib/Target/X86/X86InstrInfo.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrInfo.cpp?rev=54544&r1=54543&r2=54544&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrInfo.cpp (original) +++ llvm/trunk/lib/Target/X86/X86InstrInfo.cpp Fri Aug 8 13:30:21 2008 @@ -238,6 +238,7 @@ { X86::DIV32r, X86::DIV32m, 1 }, { X86::DIV64r, X86::DIV64m, 1 }, { X86::DIV8r, X86::DIV8m, 1 }, + { X86::EXTRACTPSrr, X86::EXTRACTPSmr, 0 }, { X86::FsMOVAPDrr, X86::MOVSDmr, 0 }, { X86::FsMOVAPSrr, X86::MOVSSmr, 0 }, { X86::IDIV16r, X86::IDIV16m, 1 }, Modified: llvm/trunk/lib/Target/X86/X86InstrSSE.td URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86InstrSSE.td?rev=54544&r1=54543&r2=54544&view=diff ============================================================================== --- llvm/trunk/lib/Target/X86/X86InstrSSE.td (original) +++ llvm/trunk/lib/Target/X86/X86InstrSSE.td Fri Aug 8 13:30:21 2008 @@ -3485,6 +3485,13 @@ defm EXTRACTPS : SS41I_extractf32<0x17, "extractps">; +// Also match an EXTRACTPS store when the store is done as f32 instead of i32. +def : Pat<(store (f32 (bitconvert (extractelt (bc_v4i32 (v4f32 VR128:$src1)), + imm:$src2))), + addr:$dst), + (EXTRACTPSmr addr:$dst, VR128:$src1, imm:$src2)>, + Requires<[HasSSE41]>; + let Constraints = "$src1 = $dst" in { multiclass SS41I_insert8 opc, string OpcodeStr> { def rr : SS4AIi8:0 [#uses=2] + +define internal void @""() nounwind { + load float* @0, align 16 ; :1 [#uses=1] + insertelement <4 x float> undef, float %1, i32 0 ; <<4 x float>>:2 [#uses=1] + call <4 x float> @llvm.x86.sse.rsqrt.ss( <4 x float> %2 ) ; <<4 x float>>:3 [#uses=1] + extractelement <4 x float> %3, i32 0 ; :4 [#uses=1] + store float %4, float* @0, align 16 + ret void +} + +declare <4 x float> @llvm.x86.sse.rsqrt.ss(<4 x float>) nounwind readnone + From gohman at apple.com Fri Aug 8 13:33:12 2008 From: gohman at apple.com (Dan Gohman) Date: Fri, 08 Aug 2008 18:33:12 -0000 Subject: [llvm-commits] [llvm] r54545 - /llvm/trunk/lib/Analysis/ScalarEvolution.cpp Message-ID: <200808081833.m78IXCpO010049@zion.cs.uiuc.edu> Author: djg Date: Fri Aug 8 13:33:12 2008 New Revision: 54545 URL: http://llvm.org/viewvc/llvm-project?rev=54545&view=rev Log: Canonicalize nested AddRecs in by nesting them in order of loop depth. Modified: llvm/trunk/lib/Analysis/ScalarEvolution.cpp Modified: llvm/trunk/lib/Analysis/ScalarEvolution.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/ScalarEvolution.cpp?rev=54545&r1=54544&r2=54545&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/ScalarEvolution.cpp (original) +++ llvm/trunk/lib/Analysis/ScalarEvolution.cpp Fri Aug 8 13:33:12 2008 @@ -1158,6 +1158,19 @@ return getAddRecExpr(Operands, L); // { X,+,0 } --> X } + // Canonicalize nested AddRecs in by nesting them in order of loop depth. + if (SCEVAddRecExpr NestedAR = dyn_cast(Operands[0])) { + const Loop NestedLoop = NestedAR->getLoop(); + if (L->getLoopDepth() < NestedLoop->getLoopDepth()) { + std::vector NestedOperands(NestedAR->op_begin(), + NestedAR->op_end()); + SCEVHandle NestedARHandle(NestedAR); + Operands[0] = NestedAR->getStart(); + NestedOperands[0] = getAddRecExpr(Operands, L); + return getAddRecExpr(NestedOperands, NestedLoop); + } + } + SCEVAddRecExpr &Result = (SCEVAddRecExprs)[std::make_pair(L, std::vector(Operands.begin(), Operands.end()))]; From kremenek at apple.com Fri Aug 8 19:05:26 2008 From: kremenek at apple.com (Ted Kremenek) Date: Sat, 09 Aug 2008 00:05:26 -0000 Subject: [llvm-commits] [llvm] r54564 - /llvm/tags/checker/checker-75/ Message-ID: <200808090005.m7905Qhd022933@zion.cs.uiuc.edu> Author: kremenek Date: Fri Aug 8 19:05:26 2008 New Revision: 54564 URL: http://llvm.org/viewvc/llvm-project?rev=54564&view=rev Log: Tagging checker-75. Added: llvm/tags/checker/checker-75/ - copied from r54563, llvm/trunk/ From gordonhenriksen at mac.com Fri Aug 8 20:53:28 2008 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Sat, 09 Aug 2008 01:53:28 -0000 Subject: [llvm-commits] [llvm] r54570 - in /llvm/trunk/test/CodeGen: CPP/ Mips/ Message-ID: <200808090153.m791rSLQ025913@zion.cs.uiuc.edu> Author: gordon Date: Fri Aug 8 20:53:27 2008 New Revision: 54570 URL: http://llvm.org/viewvc/llvm-project?rev=54570&view=rev Log: Ignore output directories. Modified: llvm/trunk/test/CodeGen/CPP/ (props changed) llvm/trunk/test/CodeGen/Mips/ (props changed) Propchange: llvm/trunk/test/CodeGen/CPP/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 8 20:53:27 2008 @@ -0,0 +1 @@ +Output Propchange: llvm/trunk/test/CodeGen/Mips/ ------------------------------------------------------------------------------ --- svn:ignore (added) +++ svn:ignore Fri Aug 8 20:53:27 2008 @@ -0,0 +1 @@ +Output From gordonhenriksen at mac.com Fri Aug 8 20:55:52 2008 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Sat, 09 Aug 2008 01:55:52 -0000 Subject: [llvm-commits] [llvm] r54571 - in /llvm/trunk: bindings/ocaml/llvm/llvm.ml bindings/ocaml/llvm/llvm.mli bindings/ocaml/llvm/llvm_ocaml.c test/Bindings/Ocaml/vmcore.ml Message-ID: <200808090155.m791tqSK026007@zion.cs.uiuc.edu> Author: gordon Date: Fri Aug 8 20:55:52 2008 New Revision: 54571 URL: http://llvm.org/viewvc/llvm-project?rev=54571&view=rev Log: [PR-2610] Adding Ocaml bindings for Switch::addCase. Modified: llvm/trunk/bindings/ocaml/llvm/llvm.ml llvm/trunk/bindings/ocaml/llvm/llvm.mli llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c llvm/trunk/test/Bindings/Ocaml/vmcore.ml Modified: llvm/trunk/bindings/ocaml/llvm/llvm.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.ml?rev=54571&r1=54570&r2=54571&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/llvm/llvm.ml (original) +++ llvm/trunk/bindings/ocaml/llvm/llvm.ml Fri Aug 8 20:55:52 2008 @@ -619,6 +619,8 @@ llvalue = "llvm_build_cond_br" external build_switch : llvalue -> llbasicblock -> int -> llbuilder -> llvalue = "llvm_build_switch" +external add_case : llvalue -> llvalue -> llbasicblock -> unit + = "llvm_add_case" external build_invoke : llvalue -> llvalue array -> llbasicblock -> llbasicblock -> string -> llbuilder -> llvalue = "llvm_build_invoke_bc" "llvm_build_invoke_nat" Modified: llvm/trunk/bindings/ocaml/llvm/llvm.mli URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.mli?rev=54571&r1=54570&r2=54571&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/llvm/llvm.mli (original) +++ llvm/trunk/bindings/ocaml/llvm/llvm.mli Fri Aug 8 20:55:52 2008 @@ -1212,13 +1212,20 @@ external build_cond_br : llvalue -> llbasicblock -> llbasicblock -> llbuilder -> llvalue = "llvm_build_cond_br" -( [build_switch case elsebb b] creates an empty +( [build_switch case elsebb count b] creates an empty [switch %case, %elsebb] - instruction at the position specified by the instruction builder [b]. + instruction at the position specified by the instruction builder [b] with + space reserved for [count] cases. See the method [llvm::LLVMBuilder::CreateSwitch]. ) external build_switch : llvalue -> llbasicblock -> int -> llbuilder -> llvalue = "llvm_build_switch" +(* [add_case sw onval bb] causes switch instruction [sw] to branch to [bb] + when its input matches the constant [onval]. + See the method [llvm::SwitchInst::addCase]. ) +external add_case : llvalue -> llvalue -> llbasicblock -> unit + = "llvm_add_case" + ( [build_invoke fn args tobb unwindbb name b] creates an [%name = invoke %fn(args) to %tobb unwind %unwindbb] instruction at the position specified by the instruction builder [b]. Modified: llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c?rev=54571&r1=54570&r2=54571&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c (original) +++ llvm/trunk/bindings/ocaml/llvm/llvm_ocaml.c Fri Aug 8 20:55:52 2008 @@ -848,6 +848,13 @@ return LLVMBuildSwitch(Builder_val(B), Of, Else, Int_val(EstimatedCount)); } +CAMLprim value llvm_add_case(LLVMValueRef Switch, + LLVMValueRef OnVal, + LLVMBasicBlockRef Dest) { + LLVMAddCase(Switch, OnVal, Dest); + return Val_unit; +} + /* llvalue -> llvalue array -> llbasicblock -> llbasicblock -> string -> llbuilder -> llvalue / CAMLprim LLVMValueRef llvm_build_invoke_nat(LLVMValueRef Fn, value Args, Modified: llvm/trunk/test/Bindings/Ocaml/vmcore.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Bindings/Ocaml/vmcore.ml?rev=54571&r1=54570&r2=54571&view=diff ============================================================================== --- llvm/trunk/test/Bindings/Ocaml/vmcore.ml (original) +++ llvm/trunk/test/Bindings/Ocaml/vmcore.ml Fri Aug 8 20:55:52 2008 @@ -825,7 +825,18 @@ ignore (build_cond_br cond bb03 bb00 b) end; - ( TODO: Switch ) + group "switch"; begin + ( RUN: grep {switch.P1.SwiBlock3} < %t.ll + * RUN: grep {2,.SwiBlock2} < %t.ll + ) + let bb1 = append_block "SwiBlock1" fn in + let bb2 = append_block "SwiBlock2" fn in + ignore (build_unreachable (builder_at_end bb2)); + let bb3 = append_block "SwiBlock3" fn in + ignore (build_unreachable (builder_at_end bb3)); + let si = build_switch p1 bb3 1 (builder_at_end bb1) in + ignore (add_case si (const_int i32_type 2) bb2) + end; group "invoke"; begin (* RUN: grep {Inst02.invoke.P1.P2} < %t.ll From gordonhenriksen at mac.com Fri Aug 8 21:13:58 2008 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Sat, 09 Aug 2008 02:13:58 -0000 Subject: [llvm-commits] [llvm] r54572 - in /llvm/trunk: bindings/ocaml/llvm/llvm.ml bindings/ocaml/llvm/llvm.mli include/llvm-c/Core.h lib/VMCore/Core.cpp Message-ID: <200808090213.m792DxNu026556@zion.cs.uiuc.edu> Author: gordon Date: Fri Aug 8 21:13:58 2008 New Revision: 54572 URL: http://llvm.org/viewvc/llvm-project?rev=54572&view=rev Log: Delete a redundant binding, LLVMHasInitializer. Please use !LLVMIsDeclaration instead. Modified: llvm/trunk/bindings/ocaml/llvm/llvm.ml llvm/trunk/bindings/ocaml/llvm/llvm.mli llvm/trunk/include/llvm-c/Core.h llvm/trunk/lib/VMCore/Core.cpp Modified: llvm/trunk/bindings/ocaml/llvm/llvm.ml URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.ml?rev=54572&r1=54571&r2=54572&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/llvm/llvm.ml (original) +++ llvm/trunk/bindings/ocaml/llvm/llvm.ml Fri Aug 8 21:13:58 2008 @@ -300,7 +300,6 @@ external lookup_global : string -> llmodule -> llvalue option = "llvm_lookup_global" external delete_global : llvalue -> unit = "llvm_delete_global" -external has_initializer : llvalue -> bool = "llvm_has_initializer" external global_initializer : llvalue -> llvalue = "LLVMGetInitializer" external set_initializer : llvalue -> llvalue -> unit = "llvm_set_initializer" external remove_initializer : llvalue -> unit = "llvm_remove_initializer" Modified: llvm/trunk/bindings/ocaml/llvm/llvm.mli URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/bindings/ocaml/llvm/llvm.mli?rev=54572&r1=54571&r2=54572&view=diff ============================================================================== --- llvm/trunk/bindings/ocaml/llvm/llvm.mli (original) +++ llvm/trunk/bindings/ocaml/llvm/llvm.mli Fri Aug 8 21:13:58 2008 @@ -815,11 +815,6 @@ external set_global_constant : bool -> llvalue -> unit = "llvm_set_global_constant" -(* [has_initializer gv] returns [true] if the global variable [gv] has an - initializer and [false] otherwise. - See the method [llvm::GlobalVariable::hasInitializer]. ) -external has_initializer : llvalue -> bool = "llvm_has_initializer" - (* [global_initializer gv] returns the initializer for the global variable [gv]. See the method [llvm::GlobalVariable::getInitializer]. ) external global_initializer : llvalue -> llvalue = "LLVMGetInitializer" Modified: llvm/trunk/include/llvm-c/Core.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm-c/Core.h?rev=54572&r1=54571&r2=54572&view=diff ============================================================================== --- llvm/trunk/include/llvm-c/Core.h (original) +++ llvm/trunk/include/llvm-c/Core.h Fri Aug 8 21:13:58 2008 @@ -392,7 +392,6 @@ LLVMValueRef LLVMGetNextGlobal(LLVMValueRef GlobalVar); LLVMValueRef LLVMGetPreviousGlobal(LLVMValueRef GlobalVar); void LLVMDeleteGlobal(LLVMValueRef GlobalVar); -int LLVMHasInitializer(LLVMValueRef GlobalVar); LLVMValueRef LLVMGetInitializer(LLVMValueRef GlobalVar); void LLVMSetInitializer(LLVMValueRef GlobalVar, LLVMValueRef ConstantVal); int LLVMIsThreadLocal(LLVMValueRef GlobalVar); Modified: llvm/trunk/lib/VMCore/Core.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Core.cpp?rev=54572&r1=54571&r2=54572&view=diff ============================================================================== --- llvm/trunk/lib/VMCore/Core.cpp (original) +++ llvm/trunk/lib/VMCore/Core.cpp Fri Aug 8 21:13:58 2008 @@ -632,10 +632,6 @@ unwrap(GlobalVar)->eraseFromParent(); } -int LLVMHasInitializer(LLVMValueRef GlobalVar) { - return unwrap(GlobalVar)->hasInitializer(); -} - LLVMValueRef LLVMGetInitializer(LLVMValueRef GlobalVar) { return wrap(unwrap(GlobalVar)->getInitializer()); } From nicholas at mxc.ca Fri Aug 8 21:33:01 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Sat, 09 Aug 2008 02:33:01 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54573 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200808090233.m792X1fH027130@zion.cs.uiuc.edu> Author: nicholas Date: Fri Aug 8 21:33:01 2008 New Revision: 54573 URL: http://llvm.org/viewvc/llvm-project?rev=54573&view=rev Log: Don't return NULL here. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54573&r1=54572&r2=54573&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug 8 21:33:01 2008 @@ -6984,7 +6984,7 @@ Idx.size()); if (ConstantExpr CE = dyn_cast(ArrayRef)) - return ConstantFoldConstantExpression(CE, &getTargetData()); + return ConstantFoldConstantExpression(CE, &getTargetData()) \|\| CE; else return ArrayRef; } From nicholas at mxc.ca Fri Aug 8 21:39:37 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Fri, 08 Aug 2008 19:39:37 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54520 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200808080950.33160.baldrick@free.fr> References: <200808080700.m7870AkF003024@zion.cs.uiuc.edu> <200808080950.33160.baldrick@free.fr> Message-ID: <489D0369.70104@mxc.ca> Duncan Sands wrote: > Hi Nick, > >> + if (ConstantExpr CE = dyn_cast(ArrayRef)) >> + return ConstantFoldConstantExpression(CE, &getTargetData()); > > in theory this method can return NULL (at least that's what > the comment on it says). Indeed, it can. Thanks for pointing that out. Nick From gordonhenriksen at mac.com Fri Aug 8 22:48:47 2008 From: gordonhenriksen at mac.com (Gordon Henriksen) Date: Sat, 09 Aug 2008 03:48:47 -0000 Subject: [llvm-commits] [llvm] r54574 - /llvm/trunk/lib/CodeGen/OcamlCollector.cpp Message-ID: <200808090348.m793mmSk029156@zion.cs.uiuc.edu> Author: gordon Date: Fri Aug 8 22:48:46 2008 New Revision: 54574 URL: http://llvm.org/viewvc/llvm-project?rev=54574&view=rev Log: Fix some typos. Apparently I think C needs a power-of operator. Modified: llvm/trunk/lib/CodeGen/OcamlCollector.cpp Modified: llvm/trunk/lib/CodeGen/OcamlCollector.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/OcamlCollector.cpp?rev=54574&r1=54573&r2=54574&view=diff ============================================================================== --- llvm/trunk/lib/CodeGen/OcamlCollector.cpp (original) +++ llvm/trunk/lib/CodeGen/OcamlCollector.cpp Fri Aug 8 22:48:46 2008 @@ -129,7 +129,7 @@ PE = MD.end(); PI != PE; ++PI) { uint64_t FrameSize = MD.getFrameSize(); - if (FrameSize >= 2<<16) { + if (FrameSize >= 1<<16) { cerr << "Function '" << MD.getFunction().getNameStart() << "' is too large for the ocaml collector! " << "Frame size " << FrameSize << " >= 65536.\n"; @@ -137,7 +137,7 @@ } size_t LiveCount = MD.live_size(PI); - if (LiveCount >= 2<<16) { + if (LiveCount >= 1<<16) { cerr << "Function '" << MD.getFunction().getNameStart() << "' is too large for the ocaml collector! " << "Live root count " << LiveCount << " >= 65536.\n"; @@ -157,7 +157,7 @@ for (CollectorMetadata::live_iterator LI = MD.live_begin(PI), LE = MD.live_end(PI); LI != LE; ++LI) { - assert(LI->StackOffset < 2<<16 && + assert(LI->StackOffset < 1<<16 && "GC root stack offset is outside of fixed stack frame and out " "of range for Ocaml collector!"); From nicholas at mxc.ca Fri Aug 8 23:30:41 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Sat, 09 Aug 2008 04:30:41 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54575 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Message-ID: <200808090430.m794Ugw8030240@zion.cs.uiuc.edu> Author: nicholas Date: Fri Aug 8 23:30:40 2008 New Revision: 54575 URL: http://llvm.org/viewvc/llvm-project?rev=54575&view=rev Log: Apologies for checking in code that doesn't even compile. Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54575&r1=54574&r2=54575&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug 8 23:30:40 2008 @@ -6984,9 +6984,10 @@ Idx.size()); if (ConstantExpr CE = dyn_cast(ArrayRef)) - return ConstantFoldConstantExpression(CE, &getTargetData()) \|\| CE; - else - return ArrayRef; + if (Constant C = ConstantFoldConstantExpression(CE, &getTargetData())) + return C; + + return ArrayRef; } Constant TreeConstantToLLVM::EmitLV_COMPONENT_REF(tree exp) { From sabre at nondot.org Sat Aug 9 01:25:47 2008 From: sabre at nondot.org (Chris Lattner) Date: Sat, 09 Aug 2008 06:25:47 -0000 Subject: [llvm-commits] [llvm] r54576 - /llvm/trunk/include/llvm/Constant.h Message-ID: <200808090625.m796PlZm001017@zion.cs.uiuc.edu> Author: lattner Date: Sat Aug 9 01:25:46 2008 New Revision: 54576 URL: http://llvm.org/viewvc/llvm-project?rev=54576&view=rev Log: comment update Modified: llvm/trunk/include/llvm/Constant.h Modified: llvm/trunk/include/llvm/Constant.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Constant.h?rev=54576&r1=54575&r2=54576&view=diff ============================================================================== --- llvm/trunk/include/llvm/Constant.h (original) +++ llvm/trunk/include/llvm/Constant.h Sat Aug 9 01:25:46 2008 @@ -83,7 +83,8 @@ /// getVectorElements - This method, which is only valid on constant of vector /// type, returns the elements of the vector in the specified smallvector. - /// This handles breaking down a vector undef into undef elements, etc. + /// This handles breaking down a vector undef into undef elements, etc. For + /// constant exprs and other cases we can't handle, we return an empty vector. void getVectorElements(SmallVectorImpl &Elts) const; /// destroyConstant - Called if some element of this constant is no longer From sabre at nondot.org Sat Aug 9 01:26:23 2008 From: sabre at nondot.org (Chris Lattner) Date: Sat, 09 Aug 2008 06:26:23 -0000 Subject: [llvm-commits] [llvm] r54577 - /llvm/trunk/include/llvm/Support/IRBuilder.h Message-ID: <200808090626.m796QN8A001044@zion.cs.uiuc.edu> Author: lattner Date: Sat Aug 9 01:26:23 2008 New Revision: 54577 URL: http://llvm.org/viewvc/llvm-project?rev=54577&view=rev Log: Make 'Insert' set the name for Loads, instead of passing the name into the LoadInst ctor, which causes std::string thrashing. Modified: llvm/trunk/include/llvm/Support/IRBuilder.h Modified: llvm/trunk/include/llvm/Support/IRBuilder.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRBuilder.h?rev=54577&r1=54576&r2=54577&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/IRBuilder.h (original) +++ llvm/trunk/include/llvm/Support/IRBuilder.h Sat Aug 9 01:26:23 2008 @@ -283,10 +283,10 @@ return Insert(new FreeInst(Ptr)); } LoadInst CreateLoad(Value Ptr, const char Name = 0) { - return Insert(new LoadInst(Ptr, Name)); + return Insert(new LoadInst(Ptr), Name); } LoadInst CreateLoad(Value Ptr, bool isVolatile, const char Name = 0) { - return Insert(new LoadInst(Ptr, Name, isVolatile)); + return Insert(new LoadInst(Ptr, 0, isVolatile), Name); } StoreInst CreateStore(Value Val, Value Ptr, bool isVolatile = false) { return Insert(new StoreInst(Val, Ptr, isVolatile)); @@ -306,7 +306,7 @@ return ConstantExpr::getGetElementPtr(PC, &IdxBegin[0], IdxEnd - IdxBegin); } - return(Insert(GetElementPtrInst::Create(Ptr, IdxBegin, IdxEnd), Name)); + return Insert(GetElementPtrInst::Create(Ptr, IdxBegin, IdxEnd), Name); } Value CreateGEP(Value Ptr, Value Idx, const char Name = "") { if (Constant PC = dyn_cast(Ptr)) From isanbard at gmail.com Sat Aug 9 01:40:11 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 8 Aug 2008 23:40:11 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54573 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200808090233.m792X1fH027130@zion.cs.uiuc.edu> References: <200808090233.m792X1fH027130@zion.cs.uiuc.edu> Message-ID: <715F84AA-3F35-4DEA-BFAF-CA2DC2B03BF2@gmail.com> On Aug 8, 2008, at 7:33 PM, Nick Lewycky wrote: > Author: nicholas > Date: Fri Aug 8 21:33:01 2008 > New Revision: 54573 > > URL: http://llvm.org/viewvc/llvm-project?rev=54573&view=rev > Log: > Don't return NULL here. > > Modified: > llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp > > Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54573&r1=54572&r2=54573&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) > +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug 8 21:33:01 2008 > @@ -6984,7 +6984,7 @@ > Idx.size()); > > if (ConstantExpr CE = dyn_cast(ArrayRef)) > - return ConstantFoldConstantExpression(CE, &getTargetData()); > + return ConstantFoldConstantExpression(CE, &getTargetData()) \|\| > CE; This returns the result of the logical "or" statement. I.e., 1 or 0. -bw From isanbard at gmail.com Sat Aug 9 01:40:51 2008 From: isanbard at gmail.com (Bill Wendling) Date: Fri, 8 Aug 2008 23:40:51 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54575 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200808090430.m794Ugw8030240@zion.cs.uiuc.edu> References: <200808090430.m794Ugw8030240@zion.cs.uiuc.edu> Message-ID: <898F7720-8FA6-49B2-AD5C-91B76D9BE5BD@gmail.com> Ah! Ignore my last comment. Thanks! -bw On Aug 8, 2008, at 9:30 PM, Nick Lewycky wrote: > Author: nicholas > Date: Fri Aug 8 23:30:40 2008 > New Revision: 54575 > > URL: http://llvm.org/viewvc/llvm-project?rev=54575&view=rev > Log: > Apologies for checking in code that doesn't even compile. > > Modified: > llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp > > Modified: llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp > URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp?rev=54575&r1=54574&r2=54575&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp (original) > +++ llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp Fri Aug 8 23:30:40 2008 > @@ -6984,9 +6984,10 @@ > Idx.size()); > > if (ConstantExpr CE = dyn_cast(ArrayRef)) > - return ConstantFoldConstantExpression(CE, &getTargetData()) \|\| > CE; > - else > - return ArrayRef; > + if (Constant C = ConstantFoldConstantExpression(CE, > &getTargetData())) > + return C; > + > + return ArrayRef; > } > > Constant TreeConstantToLLVM::EmitLV_COMPONENT_REF(tree exp) { > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From baldrick at free.fr Sat Aug 9 02:32:35 2008 From: baldrick at free.fr (Duncan Sands) Date: Sat, 9 Aug 2008 09:32:35 +0200 Subject: [llvm-commits] [llvm-gcc-4.2] r54573 - /llvm-gcc-4.2/trunk/gcc/llvm-convert.cpp In-Reply-To: <200808090233.m792X1fH027130@zion.cs.uiuc.edu> References: <200808090233.m792X1fH027130@zion.cs.uiuc.edu> Message-ID: <200808090932.36543.baldrick@free.fr> Hi, > if (ConstantExpr CE = dyn_cast(ArrayRef)) > - return ConstantFoldConstantExpression(CE, &getTargetData()); > + return ConstantFoldConstantExpression(CE, &getTargetData()) \|\| CE; this looks rather bogus. How about just introducing a variable to hold the result of the ConstantFoldConstantExpression, etc? Ciao, Duncan. From nicholas at mxc.ca Sat Aug 9 03:03:58 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Sat, 09 Aug 2008 08:03:58 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54578 - /llvm-gcc-4.2/trunk/gcc/cppdefault.c Message-ID: <200808090803.m7983wNe017634@zion.cs.uiuc.edu> Author: nicholas Date: Sat Aug 9 03:03:57 2008 New Revision: 54578 URL: http://llvm.org/viewvc/llvm-project?rev=54578&view=rev Log: Restore Rafael's changes in r53455. (Heads up for Bill, please don't clobber!) Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=54578&r1=54577&r2=54578&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original) +++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Sat Aug 9 03:03:57 2008 @@ -46,6 +46,11 @@ / APPLE LOCAL begin SDK 3886137. / / Allow -isysroot to override ALL include patchs. This is done by setting add_sysroot for all default inclue paths. / +#ifdef CONFIG_DARWIN_H +#define ADD_SYSROOT 1 +#else +#define ADD_SYSROOT 0 +#endif const struct default_include cpp_include_defaults[] #ifdef INCLUDE_DEFAULTS = INCLUDE_DEFAULTS; @@ -53,34 +58,34 @@ = { #ifdef GPLUSPLUS_INCLUDE_DIR / Pick up GNU C++ generic include files. / - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 }, #endif #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR / Pick up GNU C++ target-dependent include files. / - { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 1, 1 }, + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 1 }, #endif #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR / Pick up GNU C++ backward and deprecated include files. / - { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 }, #endif #ifdef LOCAL_INCLUDE_DIR / /usr/local/include comes before the fixincluded header files. / { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, #endif #ifdef PREFIX_INCLUDE_DIR - { PREFIX_INCLUDE_DIR, 0, 0, 1, 1, 0 }, + { PREFIX_INCLUDE_DIR, 0, 0, 1, ADD_SYSROOT, 0 }, #endif #ifdef GCC_INCLUDE_DIR / This is the dir for fixincludes and for gcc's private headers. / - { GCC_INCLUDE_DIR, "GCC", 0, 0, 1, 0 }, + { GCC_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 }, #endif #ifdef CROSS_INCLUDE_DIR / One place the target system's headers might be. / - { CROSS_INCLUDE_DIR, "GCC", 0, 0, 1, 0 }, + { CROSS_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 }, #endif #ifdef TOOL_INCLUDE_DIR / Another place the target system's headers might be. / - { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 1, 0 }, + { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, ADD_SYSROOT, 0 }, #endif #ifdef SYSTEM_INCLUDE_DIR / Some systems have an extra dir of include files. / @@ -94,6 +99,7 @@ }; #endif / no INCLUDE_DEFAULTS / +#undef ADD_SYSROOT / APPLE LOCAL end SDK 3886137. / #ifdef GCC_INCLUDE_DIR From isanbard at gmail.com Sat Aug 9 04:06:45 2008 From: isanbard at gmail.com (Bill Wendling) Date: Sat, 9 Aug 2008 02:06:45 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54578 - /llvm-gcc-4.2/trunk/gcc/cppdefault.c In-Reply-To: <200808090803.m7983wNe017634@zion.cs.uiuc.edu> References: <200808090803.m7983wNe017634@zion.cs.uiuc.edu> Message-ID: <653A1699-1988-48A0-95B8-5565DBA02871@gmail.com> Sorry for reverting them before. Could you go through and put "LLVM LOCAL" comments before these changes? That way I won't do that again. :-) -bw On Aug 9, 2008, at 1:03 AM, Nick Lewycky wrote: > Author: nicholas > Date: Sat Aug 9 03:03:57 2008 > New Revision: 54578 > > URL: http://llvm.org/viewvc/llvm-project?rev=54578&view=rev > Log: > Restore Rafael's changes in r53455. (Heads up for Bill, please don't > clobber!) > > > Modified: > llvm-gcc-4.2/trunk/gcc/cppdefault.c > > Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c > URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=54578&r1=54577&r2=54578&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original) > +++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Sat Aug 9 03:03:57 2008 > @@ -46,6 +46,11 @@ > / APPLE LOCAL begin SDK 3886137. / > / Allow -isysroot to override ALL include patchs. This is done by > setting add_sysroot for all default inclue paths. / > +#ifdef CONFIG_DARWIN_H > +#define ADD_SYSROOT 1 > +#else > +#define ADD_SYSROOT 0 > +#endif > const struct default_include cpp_include_defaults[] > #ifdef INCLUDE_DEFAULTS > = INCLUDE_DEFAULTS; > @@ -53,34 +58,34 @@ > = { > #ifdef GPLUSPLUS_INCLUDE_DIR > / Pick up GNU C++ generic include files. / > - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, > + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 }, > #endif > #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR > / Pick up GNU C++ target-dependent include files. / > - { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 1, 1 }, > + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 1 }, > #endif > #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR > / Pick up GNU C++ backward and deprecated include files. / > - { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, > + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 }, > #endif > #ifdef LOCAL_INCLUDE_DIR > / /usr/local/include comes before the fixincluded header > files. / > { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, > #endif > #ifdef PREFIX_INCLUDE_DIR > - { PREFIX_INCLUDE_DIR, 0, 0, 1, 1, 0 }, > + { PREFIX_INCLUDE_DIR, 0, 0, 1, ADD_SYSROOT, 0 }, > #endif > #ifdef GCC_INCLUDE_DIR > / This is the dir for fixincludes and for gcc's private > headers. / > - { GCC_INCLUDE_DIR, "GCC", 0, 0, 1, 0 }, > + { GCC_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 }, > #endif > #ifdef CROSS_INCLUDE_DIR > / One place the target system's headers might be. / > - { CROSS_INCLUDE_DIR, "GCC", 0, 0, 1, 0 }, > + { CROSS_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 }, > #endif > #ifdef TOOL_INCLUDE_DIR > / Another place the target system's headers might be. / > - { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 1, 0 }, > + { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, ADD_SYSROOT, 0 }, > #endif > #ifdef SYSTEM_INCLUDE_DIR > / Some systems have an extra dir of include files. / > @@ -94,6 +99,7 @@ > }; > #endif / no INCLUDE_DEFAULTS / > > +#undef ADD_SYSROOT > / APPLE LOCAL end SDK 3886137. / > > #ifdef GCC_INCLUDE_DIR > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From cedric.venet at laposte.net Sat Aug 9 06:57:41 2008 From: cedric.venet at laposte.net (Cedric Venet) Date: Sat, 09 Aug 2008 11:57:41 -0000 Subject: [llvm-commits] [llvm] r54580 - /llvm/trunk/win32/CodeGen/CodeGen.vcproj Message-ID: <200808091157.m79BvfoQ024306@zion.cs.uiuc.edu> Author: venet Date: Sat Aug 9 06:57:39 2008 New Revision: 54580 URL: http://llvm.org/viewvc/llvm-project?rev=54580&view=rev Log: update VS project. Modified: llvm/trunk/win32/CodeGen/CodeGen.vcproj Modified: llvm/trunk/win32/CodeGen/CodeGen.vcproj URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/win32/CodeGen/CodeGen.vcproj?rev=54580&r1=54579&r2=54580&view=diff ============================================================================== --- llvm/trunk/win32/CodeGen/CodeGen.vcproj (original) +++ llvm/trunk/win32/CodeGen/CodeGen.vcproj Sat Aug 9 06:57:39 2008 @@ -560,6 +560,10 @@ > + + @@ -751,6 +755,10 @@ > + + From baldrick at free.fr Sat Aug 9 10:15:03 2008 From: baldrick at free.fr (Duncan Sands) Date: Sat, 09 Aug 2008 15:15:03 -0000 Subject: [llvm-commits] [llvm] r54581 - /llvm/trunk/include/llvm/Support/IRBuilder.h Message-ID: <200808091515.m79FF3N5029936@zion.cs.uiuc.edu> Author: baldrick Date: Sat Aug 9 10:14:59 2008 New Revision: 54581 URL: http://llvm.org/viewvc/llvm-project?rev=54581&view=rev Log: Unbreak the llvm-gcc build: recent changes to IRBuilder are not expecting null names. Modified: llvm/trunk/include/llvm/Support/IRBuilder.h Modified: llvm/trunk/include/llvm/Support/IRBuilder.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRBuilder.h?rev=54581&r1=54580&r2=54581&view=diff ============================================================================== --- llvm/trunk/include/llvm/Support/IRBuilder.h (original) +++ llvm/trunk/include/llvm/Support/IRBuilder.h Sat Aug 9 10:14:59 2008 @@ -282,10 +282,10 @@ FreeInst CreateFree(Value Ptr) { return Insert(new FreeInst(Ptr)); } - LoadInst CreateLoad(Value Ptr, const char Name = 0) { + LoadInst CreateLoad(Value Ptr, const char Name = "") { return Insert(new LoadInst(Ptr), Name); } - LoadInst CreateLoad(Value Ptr, bool isVolatile, const char Name = 0) { + LoadInst CreateLoad(Value Ptr, bool isVolatile, const char Name = "") { return Insert(new LoadInst(Ptr, 0, isVolatile), Name); } StoreInst CreateStore(Value Val, Value Ptr, bool isVolatile = false) { From nicholas at mxc.ca Sat Aug 9 10:46:44 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Sat, 09 Aug 2008 15:46:44 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54582 - /llvm-gcc-4.2/trunk/gcc/cppdefault.c Message-ID: <200808091546.m79Fki2O030755@zion.cs.uiuc.edu> Author: nicholas Date: Sat Aug 9 10:46:38 2008 New Revision: 54582 URL: http://llvm.org/viewvc/llvm-project?rev=54582&view=rev Log: Mark LLVM LOCAL changes. Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=54582&r1=54581&r2=54582&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original) +++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Sat Aug 9 10:46:38 2008 @@ -46,6 +46,7 @@ /* APPLE LOCAL begin SDK 3886137. / / Allow -isysroot to override ALL include patchs. This is done by setting add_sysroot for all default inclue paths. / +/ LLVM LOCAL begin - fix sysroot on non-Darwin systems / #ifdef CONFIG_DARWIN_H #define ADD_SYSROOT 1 #else @@ -100,6 +101,7 @@ #endif / no INCLUDE_DEFAULTS / #undef ADD_SYSROOT +/ LLVM local end / / APPLE LOCAL end SDK 3886137. / #ifdef GCC_INCLUDE_DIR From nicholas at mxc.ca Sat Aug 9 10:47:27 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Sat, 09 Aug 2008 08:47:27 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54578 - /llvm-gcc-4.2/trunk/gcc/cppdefault.c In-Reply-To: <653A1699-1988-48A0-95B8-5565DBA02871@gmail.com> References: <200808090803.m7983wNe017634@zion.cs.uiuc.edu> <653A1699-1988-48A0-95B8-5565DBA02871@gmail.com> Message-ID: <489DBC0F.6050708@mxc.ca> Bill Wendling wrote: > Sorry for reverting them before. Could you go through and put "LLVM > LOCAL" comments before these changes? That way I won't do that > again. :-) Sounds like good advice to me! :-) Thanks! Nick > -bw > > On Aug 9, 2008, at 1:03 AM, Nick Lewycky wrote: > >> Author: nicholas >> Date: Sat Aug 9 03:03:57 2008 >> New Revision: 54578 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=54578&view=rev >> Log: >> Restore Rafael's changes in r53455. (Heads up for Bill, please don't >> clobber!) >> >> >> Modified: >> llvm-gcc-4.2/trunk/gcc/cppdefault.c >> >> Modified: llvm-gcc-4.2/trunk/gcc/cppdefault.c >> URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cppdefault.c?rev=54578&r1=54577&r2=54578&view=diff >> >> = >> = >> = >> = >> = >> = >> = >> = >> ====================================================================== >> --- llvm-gcc-4.2/trunk/gcc/cppdefault.c (original) >> +++ llvm-gcc-4.2/trunk/gcc/cppdefault.c Sat Aug 9 03:03:57 2008 >> @@ -46,6 +46,11 @@ >> / APPLE LOCAL begin SDK 3886137. / >> / Allow -isysroot to override ALL include patchs. This is done by >> setting add_sysroot for all default inclue paths. / >> +#ifdef CONFIG_DARWIN_H >> +#define ADD_SYSROOT 1 >> +#else >> +#define ADD_SYSROOT 0 >> +#endif >> const struct default_include cpp_include_defaults[] >> #ifdef INCLUDE_DEFAULTS >> = INCLUDE_DEFAULTS; >> @@ -53,34 +58,34 @@ >> = { >> #ifdef GPLUSPLUS_INCLUDE_DIR >> / Pick up GNU C++ generic include files. / >> - { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, >> + { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 }, >> #endif >> #ifdef GPLUSPLUS_TOOL_INCLUDE_DIR >> / Pick up GNU C++ target-dependent include files. / >> - { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, 1, 1 }, >> + { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 1 }, >> #endif >> #ifdef GPLUSPLUS_BACKWARD_INCLUDE_DIR >> / Pick up GNU C++ backward and deprecated include files. / >> - { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, 1, 0 }, >> + { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, ADD_SYSROOT, 0 }, >> #endif >> #ifdef LOCAL_INCLUDE_DIR >> / /usr/local/include comes before the fixincluded header >> files. / >> { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, >> #endif >> #ifdef PREFIX_INCLUDE_DIR >> - { PREFIX_INCLUDE_DIR, 0, 0, 1, 1, 0 }, >> + { PREFIX_INCLUDE_DIR, 0, 0, 1, ADD_SYSROOT, 0 }, >> #endif >> #ifdef GCC_INCLUDE_DIR >> / This is the dir for fixincludes and for gcc's private >> headers. / >> - { GCC_INCLUDE_DIR, "GCC", 0, 0, 1, 0 }, >> + { GCC_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 }, >> #endif >> #ifdef CROSS_INCLUDE_DIR >> / One place the target system's headers might be. / >> - { CROSS_INCLUDE_DIR, "GCC", 0, 0, 1, 0 }, >> + { CROSS_INCLUDE_DIR, "GCC", 0, 0, ADD_SYSROOT, 0 }, >> #endif >> #ifdef TOOL_INCLUDE_DIR >> / Another place the target system's headers might be. / >> - { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 1, 0 }, >> + { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, ADD_SYSROOT, 0 }, >> #endif >> #ifdef SYSTEM_INCLUDE_DIR >> / Some systems have an extra dir of include files. / >> @@ -94,6 +99,7 @@ >> }; >> #endif / no INCLUDE_DEFAULTS / >> >> +#undef ADD_SYSROOT >> / APPLE LOCAL end SDK 3886137. / >> >> #ifdef GCC_INCLUDE_DIR >> >> >> _______________________________________________ >> llvm-commits mailing list >> llvm-commits at cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits > From clattner at apple.com Sat Aug 9 12:04:29 2008 From: clattner at apple.com (Chris Lattner) Date: Sat, 9 Aug 2008 10:04:29 -0700 Subject: [llvm-commits] [llvm] r54581 - /llvm/trunk/include/llvm/Support/IRBuilder.h In-Reply-To: <200808091515.m79FF3N5029936@zion.cs.uiuc.edu> References: <200808091515.m79FF3N5029936@zion.cs.uiuc.edu> Message-ID: On Aug 9, 2008, at 8:15 AM, Duncan Sands wrote: > Author: baldrick > Date: Sat Aug 9 10:14:59 2008 > New Revision: 54581 > > URL: http://llvm.org/viewvc/llvm-project?rev=54581&view=rev > Log: > Unbreak the llvm-gcc build: recent changes to > IRBuilder are not expecting null names. Doh, sorry :(. -Chris > > > Modified: > llvm/trunk/include/llvm/Support/IRBuilder.h > > Modified: llvm/trunk/include/llvm/Support/IRBuilder.h > URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/IRBuilder.h?rev=54581&r1=54580&r2=54581&view=diff > > = > = > = > = > = > = > = > = > ====================================================================== > --- llvm/trunk/include/llvm/Support/IRBuilder.h (original) > +++ llvm/trunk/include/llvm/Support/IRBuilder.h Sat Aug 9 10:14:59 > 2008 > @@ -282,10 +282,10 @@ > FreeInst CreateFree(Value Ptr) { > return Insert(new FreeInst(Ptr)); > } > - LoadInst CreateLoad(Value Ptr, const char Name = 0) { > + LoadInst CreateLoad(Value Ptr, const char Name = "") { > return Insert(new LoadInst(Ptr), Name); > } > - LoadInst CreateLoad(Value Ptr, bool isVolatile, const char > Name = 0) { > + LoadInst CreateLoad(Value Ptr, bool isVolatile, const char > Name = "") { > return Insert(new LoadInst(Ptr, 0, isVolatile), Name); > } > StoreInst CreateStore(Value Val, Value Ptr, bool isVolatile = > false) { > > > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From nicholas at mxc.ca Sat Aug 9 12:08:49 2008 From: nicholas at mxc.ca (Nick Lewycky) Date: Sat, 09 Aug 2008 17:08:49 -0000 Subject: [llvm-commits] [llvm-gcc-4.2] r54586 - in /llvm-gcc-4.2/trunk/gcc/cp: cp-tree.h decl2.c lex.c pt.c Message-ID: <200808091708.m79H8nWL000934@zion.cs.uiuc.edu> Author: nicholas Date: Sat Aug 9 12:08:49 2008 New Revision: 54586 URL: http://llvm.org/viewvc/llvm-project?rev=54586&view=rev Log: Reinstate clobbered r53456, this time with LLVM LOCAL notices. Note that it's not really llvm local, since it's a backport of FSF GCC changes. Modified: llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h llvm-gcc-4.2/trunk/gcc/cp/decl2.c llvm-gcc-4.2/trunk/gcc/cp/lex.c llvm-gcc-4.2/trunk/gcc/cp/pt.c Modified: llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h?rev=54586&r1=54585&r2=54586&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h (original) +++ llvm-gcc-4.2/trunk/gcc/cp/cp-tree.h Sat Aug 9 12:08:49 2008 @@ -4155,6 +4155,9 @@ extern void yyhook (int); extern bool cxx_init (void); extern void cxx_finish (void); +/* LLVM LOCAL begin - Fix for GCC PR c++/29365 / +extern bool in_main_input_context (void); +/ LLVM LOCAL end / / in method.c / extern void init_method (void); @@ -4237,6 +4240,9 @@ extern bool reregister_specialization (tree, tree, tree); extern tree fold_non_dependent_expr (tree); extern bool explicit_class_specialization_p (tree); +/ LLVM LOCAL begin - Fix for GCC PR c++/29365 / +extern tree outermost_tinst_level (void); +/ LLVM LOCAL end / / in repo.c / extern void init_repo (void); Modified: llvm-gcc-4.2/trunk/gcc/cp/decl2.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/decl2.c?rev=54586&r1=54585&r2=54586&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/cp/decl2.c (original) +++ llvm-gcc-4.2/trunk/gcc/cp/decl2.c Sat Aug 9 12:08:49 2008 @@ -1893,9 +1893,14 @@ int subvis = type_visibility (ftype); if (subvis == VISIBILITY_ANON) - warning (0, "\ + / LLVM LOCAL begin - Fix for GCC PR c++/29365 / + { + if (!in_main_input_context ()) + warning (0, "\ %qT has a field %qD whose type uses the anonymous namespace", type, t); + } + / LLVM LOCAL end / else if (IS_AGGR_TYPE (ftype) && vis < VISIBILITY_HIDDEN && subvis >= VISIBILITY_HIDDEN) @@ -1910,9 +1915,14 @@ int subvis = type_visibility (TREE_TYPE (t)); if (subvis == VISIBILITY_ANON) - warning (0, "\ + / LLVM LOCAL begin - Fix for GCC PR c++/29365 / + { + if (!in_main_input_context()) + warning (0, "\ %qT has a base %qT whose type uses the anonymous namespace", type, TREE_TYPE (t)); + } + / LLVM LOCAL end / else if (vis < VISIBILITY_HIDDEN && subvis >= VISIBILITY_HIDDEN) warning (OPT_Wattributes, "\ Modified: llvm-gcc-4.2/trunk/gcc/cp/lex.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/lex.c?rev=54586&r1=54585&r2=54586&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/cp/lex.c (original) +++ llvm-gcc-4.2/trunk/gcc/cp/lex.c Sat Aug 9 12:08:49 2008 @@ -877,3 +877,20 @@ return t; } + +/ LLVM LOCAL begin - Fix for GCC PR c++/29365 / +/ Returns true if we are currently in the main source file, or in a + template instantiation started from the main source file. / + +bool +in_main_input_context (void) +{ + tree tl = outermost_tinst_level(); + + if (tl) + return strcmp (main_input_filename, + LOCATION_FILE (TINST_LOCATION (tl))) == 0; + else + return strcmp (main_input_filename, input_filename) == 0; +} +/ LLVM LOCAL end / Modified: llvm-gcc-4.2/trunk/gcc/cp/pt.c URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/cp/pt.c?rev=54586&r1=54585&r2=54586&view=diff ============================================================================== --- llvm-gcc-4.2/trunk/gcc/cp/pt.c (original) +++ llvm-gcc-4.2/trunk/gcc/cp/pt.c Sat Aug 9 12:08:49 2008 @@ -5288,6 +5288,17 @@ pop_tinst_level (); } +/ LLVM LOCAL begin - Fix for GCC PR c++/29365 / +/ Returns the TINST_LEVEL which gives the original instantiation + context. / + +tree +outermost_tinst_level (void) +{ + return tree_last (current_tinst_level); +} +/ LLVM LOCAL end / + / DECL is a friend FUNCTION_DECL or TEMPLATE_DECL. ARGS is the vector of template arguments, as for tsubst. From sabre at nondot.org Sat Aug 9 12:23:35 2008 From: sabre at nondot.org (Chris Lattner) Date: Sat, 09 Aug 2008 17:23:35 -0000 Subject: [llvm-commits] [llvm] r54589 - in /llvm/trunk: include/llvm/Analysis/SparsePropagation.h lib/Analysis/SparsePropagation.cpp Message-ID: <200808091723.m79HNZMq001367@zion.cs.uiuc.edu> Author: lattner Date: Sat Aug 9 12:23:35 2008 New Revision: 54589 URL: http://llvm.org/viewvc/llvm-project?rev=54589&view=rev Log: "This patch adds a virtual call to AbstractLatticeFunction to derive a type lattice value for an Argument, giving clients the opportunity to use something other than Top for it if they choose to." Patch by John McCall! Modified: llvm/trunk/include/llvm/Analysis/SparsePropagation.h llvm/trunk/lib/Analysis/SparsePropagation.cpp Modified: llvm/trunk/include/llvm/Analysis/SparsePropagation.h URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Analysis/SparsePropagation.h?rev=54589&r1=54588&r2=54589&view=diff ============================================================================== --- llvm/trunk/include/llvm/Analysis/SparsePropagation.h (original) +++ llvm/trunk/include/llvm/Analysis/SparsePropagation.h Sat Aug 9 12:23:35 2008 @@ -24,6 +24,7 @@ namespace llvm { class Value; class Constant; + class Argument; class Instruction; class PHINode; class TerminatorInst; @@ -75,6 +76,12 @@ virtual Constant GetConstant(LatticeVal LV, Value Val, SparseSolver &SS) { return 0; } + + /// ComputeArgument - Given a formal argument value, compute and return a + /// lattice value corresponding to the specified argument. + virtual LatticeVal ComputeArgument(Argument I) { + return getOverdefinedVal(); // always safe + } /// MergeValues - Compute and return the merge of the two specified lattice /// values. Merging should only move one direction down the lattice to Modified: llvm/trunk/lib/Analysis/SparsePropagation.cpp URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/SparsePropagation.cpp?rev=54589&r1=54588&r2=54589&view=diff ============================================================================== --- llvm/trunk/lib/Analysis/SparsePropagation.cpp (original) +++ llvm/trunk/lib/Analysis/SparsePropagation.cpp Sat Aug 9 12:23:35 2008 @@ -57,8 +57,10 @@ return LatticeFunc->getUntrackedVal(); else if (Constant C = dyn_cast(V)) LV = LatticeFunc->ComputeConstant(C); + else if (Argument A = dyn_cast(V)) + LV = LatticeFunc->ComputeArgument(A); else if (!isa(V)) - // Non-instructions (e.g. formal arguments) are overdefined. + // All other non-instructions are overdefined. LV = LatticeFunc->getOverdefinedVal(); else // All instructions are underdefined by default. From isanbard at gmail.com Sat Aug 9 16:52:06 2008 From: isanbard at gmail.com (Bill Wendling) Date: Sat, 9 Aug 2008 14:52:06 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54586 - in /llvm-gcc-4.2/trunk/gcc/cp: cp-tree.h decl2.c lex.c pt.c In-Reply-To: <200808091708.m79H8nWL000934@zion.cs.uiuc.edu> References: <200808091708.m79H8nWL000934@zion.cs.uiuc.edu> Message-ID: <282FCCED-8EA4-43DF-B696-EFB3D9B6E07C@gmail.com> On Aug 9, 2008, at 10:08 AM, Nick Lewycky wrote: > Author: nicholas > Date: Sat Aug 9 12:08:49 2008 > New Revision: 54586 > > URL: http://llvm.org/viewvc/llvm-project?rev=54586&view=rev > Log: > Reinstate clobbered r53456, this time with LLVM LOCAL notices. > Note that it's not really llvm local, since it's a backport of FSF > GCC changes. Thanks! And you're right that it's not really llvm local in the normal sense. But it will help distinguish between those changes in Apple's GCC and our branch. Sorry for clobbering r53456. -bw From echristo at apple.com Sat Aug 9 17:41:45 2008 From: echristo at apple.com (Eric Christopher) Date: Sat, 09 Aug 2008 15:41:45 -0700 Subject: [llvm-commits] [llvm-gcc-4.2] r54586 - in /llvm-gcc-4.2/trunk/gcc/cp: cp-tree.h decl2.c lex.c pt.c In-Reply-To: <282FCCED-8EA4-43DF-B696-EFB3D9B6E07C@gmail.com> References: <200808091708.m79H8nWL000934@zion.cs.uiuc.edu> <282FCCED-8EA4-43DF-B696-EFB3D9B6E07C@gmail.com> Message-ID: <6CF40073-47F1-4816-A0A7-EFB0524B051A@apple.com> I told Nicholas I'd put it into our 4.2 branch. :) Sent from my iPhone On Aug 9, 2008, at 2:52 PM, Bill Wendling wrote: > On Aug 9, 2008, at 10:08 AM, Nick Lewycky wrote: > >> Author: nicholas >> Date: Sat Aug 9 12:08:49 2008 >> New Revision: 54586 >> >> URL: http://llvm.org/viewvc/llvm-project?rev=54586&view=rev >> Log: >> Reinstate clobbered r53456, this time with LLVM LOCAL notices. >> Note that it's not really llvm local, since it's a backport of FSF >> GCC changes. > > Thanks! And you're right that it's not really llvm local in the normal > sense. But it will help distinguish between those changes in Apple's > GCC and our branch. > > Sorry for clobbering r53456. > > -bw > _______________________________________________ > llvm-commits mailing list > llvm-commits at cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits From sabre at nondot.org Sat Aug 9 19:47:21 2008 From: sabre at nondot.org (Chris Lattner) Date: Sun, 10 Aug 2008 00:47:21 -0000 Subject: [llvm-commits] [llvm] r54602 - /llvm/trunk/lib/Target/README.txt Message-ID: <200808100047.m7A0lLMs014579@zion.cs.uiuc.edu> Author: lattner Date: Sat Aug 9 19:47:21 2008 New Revision: 54602 URL: http://llvm.org/viewvc/llvm-project?rev=54602&view=rev Log: add a note Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=54602&r1=54601&r2=54602&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Sat Aug 9 19:47:21 2008 @@ -438,6 +438,19 @@ //===---------------------------------------------------------------------===// +Tail recursion elimination should handle: + +int pow2m1(int n) { + if (n == 0) + return 0; + return 2 * pow2m1 (n - 1) + 1; +} + +Also, multiplies can be turned into SHL's, so they should be handled as if +they were associative. "return foo() << 1" can be tail recursion eliminated. + +//===---------------------------------------------------------------------===// + Argument promotion should promote arguments for recursive functions, like this: From sabre at nondot.org Sat Aug 9 20:14:09 2008 From: sabre at nondot.org (Chris Lattner) Date: Sun, 10 Aug 2008 01:14:09 -0000 Subject: [llvm-commits] [llvm] r54603 - /llvm/trunk/lib/Target/README.txt Message-ID: <200808100114.m7A1E9AU015322@zion.cs.uiuc.edu> Author: lattner Date: Sat Aug 9 20:14:08 2008 New Revision: 54603 URL: http://llvm.org/viewvc/llvm-project?rev=54603&view=rev Log: move some more stuff out of my email into readme.txt Modified: llvm/trunk/lib/Target/README.txt Modified: llvm/trunk/lib/Target/README.txt URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/README.txt?rev=54603&r1=54602&r2=54603&view=diff ============================================================================== --- llvm/trunk/lib/Target/README.txt (original) +++ llvm/trunk/lib/Target/README.txt Sat Aug 9 20:14:08 2008 @@ -809,3 +809,76 @@ //===---------------------------------------------------------------------===// +We generate a horrible libcall for llvm.powi. For example, we compile: + +#include +double f(double a) { return std::pow(a, 4); } + +into: + +__Z1fd: + subl $12, %esp + movsd 16(%esp), %xmm0 + movsd %xmm0, (%esp) + movl $4, 8(%esp) + call L___powidf2$stub + addl $12, %esp + ret + +GCC produces: + +__Z1fd: + subl $12, %esp + movsd 16(%esp), %xmm0 + mulsd %xmm0, %xmm0 + mulsd %xmm0, %xmm0 + movsd %xmm0, (%esp) + fldl (%esp) + addl $12, %esp + ret + +//===---------------------------------------------------------------------===// + +We compile this program: (from GCC PR11680) +http://gcc.gnu.org/bugzilla/attachment.cgi?id=4487 + +Into code that runs the same speed in fast/slow modes, but both modes run 2x +slower than when compile with GCC (either 4.0 or 4.2): + +$ llvm-g++ perf.cpp -O3 -fno-exceptions +$ time ./a.out fast +1.821u 0.003s 0:01.82 100.0% 0+0k 0+0io 0pf+0w + +$ g++ perf.cpp -O3 -fno-exceptions +$ time ./a.out fast +0.821u 0.001s 0:00.82 100.0% 0+0k 0+0io 0pf+0w + +It looks like we are making the same inlining decisions, so this may be raw +codegen badness or something else (haven't investigated). + +//===---------------------------------------------------------------------===// + +We miss some instcombines for stuff like this: +void bar (void); +void foo (unsigned int a) { + /* This one is equivalent to a >= (3 << 2). */ + if ((a >> 2) >= 3) + bar (); +} + +A few other related ones are in GCC PR14753. + +//===---------------------------------------------------------------------===// + +Divisibility by constant can be simplified (according to GCC PR12849) from +being a mulhi to being a mul lo (cheaper). Testcase: + +void bar(unsigned n) { + if (n % 3 == 0) + true(); +} + +I think this basically amounts to a dag combine to simplify comparisons against +multiply hi's into a comparison against the mullo. + +//===---------------------------------------------------------------------===//