[llvm-commits] [llvm] r118952 - in /llvm/trunk: test/ExecutionEngine/ tools/lli/

Daniel Dunbar daniel at zuster.org
Fri Nov 12 16:28:01 PST 2010


Author: ddunbar
Date: Fri Nov 12 18:28:01 2010
New Revision: 118952

URL: http://llvm.org/viewvc/llvm-project?rev=118952&view=rev
Log:
lli: Switch to using ParseIRFile, for consistency with other LLVM tools.

 - Also, switch tests to not using llvm-as. They run 20% faster now, not that it matters.

Modified:
    llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll
    llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
    llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll
    llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll
    llvm/trunk/test/ExecutionEngine/2003-01-09-SARTest.ll
    llvm/trunk/test/ExecutionEngine/2003-01-10-FUCOM.ll
    llvm/trunk/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
    llvm/trunk/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
    llvm/trunk/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
    llvm/trunk/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
    llvm/trunk/test/ExecutionEngine/2003-06-04-bzip2-bug.ll
    llvm/trunk/test/ExecutionEngine/2003-06-05-PHIBug.ll
    llvm/trunk/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
    llvm/trunk/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
    llvm/trunk/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
    llvm/trunk/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
    llvm/trunk/test/ExecutionEngine/2005-12-02-TailCallBug.ll
    llvm/trunk/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll
    llvm/trunk/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll
    llvm/trunk/test/ExecutionEngine/2010-01-15-UndefValue.ll
    llvm/trunk/test/ExecutionEngine/fpbitcast.ll
    llvm/trunk/test/ExecutionEngine/hello.ll
    llvm/trunk/test/ExecutionEngine/hello2.ll
    llvm/trunk/test/ExecutionEngine/simplesttest.ll
    llvm/trunk/test/ExecutionEngine/simpletest.ll
    llvm/trunk/test/ExecutionEngine/stubs.ll
    llvm/trunk/test/ExecutionEngine/test-arith.ll
    llvm/trunk/test/ExecutionEngine/test-branch.ll
    llvm/trunk/test/ExecutionEngine/test-call.ll
    llvm/trunk/test/ExecutionEngine/test-cast.ll
    llvm/trunk/test/ExecutionEngine/test-constantexpr.ll
    llvm/trunk/test/ExecutionEngine/test-fp.ll
    llvm/trunk/test/ExecutionEngine/test-loadstore.ll
    llvm/trunk/test/ExecutionEngine/test-logical.ll
    llvm/trunk/test/ExecutionEngine/test-loop.ll
    llvm/trunk/test/ExecutionEngine/test-malloc.ll
    llvm/trunk/test/ExecutionEngine/test-phi.ll
    llvm/trunk/test/ExecutionEngine/test-ret.ll
    llvm/trunk/test/ExecutionEngine/test-setcond-fp.ll
    llvm/trunk/test/ExecutionEngine/test-setcond-int.ll
    llvm/trunk/test/ExecutionEngine/test-shift.ll
    llvm/trunk/tools/lli/Makefile
    llvm/trunk/tools/lli/lli.cpp

Modified: llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2002-12-16-ArgTest.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 @.LC0 = internal global [10 x i8] c"argc: %d\0A\00"		; <[10 x i8]*> [#uses=1]
 

Modified: llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-01-04-ArgumentBug.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @foo(i32 %X, i32 %Y, double %A) {
 	%cond212 = fcmp une double %A, 1.000000e+00		; <i1> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-01-04-LoopTest.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 	call i32 @mylog( i32 4 )		; <i32>:1 [#uses=0]

Modified: llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-01-04-PhiTest.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 ; <label>:0

Modified: llvm/trunk/test/ExecutionEngine/2003-01-09-SARTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-09-SARTest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-01-09-SARTest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-01-09-SARTest.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; We were accidentally inverting the signedness of right shifts.  Whoops.
 

Modified: llvm/trunk/test/ExecutionEngine/2003-01-10-FUCOM.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-10-FUCOM.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-01-10-FUCOM.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-01-10-FUCOM.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 	%X = fadd double 0.000000e+00, 1.000000e+00		; <double> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/2003-01-15-AlignmentTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-01-15-AlignmentTest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-01-15-AlignmentTest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-01-15-AlignmentTest.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @bar(i8* %X) {
         ; pointer should be 4 byte aligned!

Modified: llvm/trunk/test/ExecutionEngine/2003-05-06-LivenessClobber.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-05-06-LivenessClobber.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-05-06-LivenessClobber.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-05-06-LivenessClobber.ll Fri Nov 12 18:28:01 2010
@@ -1,6 +1,6 @@
-; This testcase shoudl return with an exit code of 1.
+; This testcase should return with an exit code of 1.
 ;
-; RUN: llvm-as < %s | not lli
+; RUN: not lli %s
 
 @test = global i64 0		; <i64*> [#uses=1]
 

Modified: llvm/trunk/test/ExecutionEngine/2003-05-07-ArgumentTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-05-07-ArgumentTest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-05-07-ArgumentTest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-05-07-ArgumentTest.ll Fri Nov 12 18:28:01 2010
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | lli - test
+; RUN: lli %s test
 
 declare i32 @puts(i8*)
 

Modified: llvm/trunk/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-05-11-PHIRegAllocBug.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 target datalayout = "e-p:32:32"
 

Modified: llvm/trunk/test/ExecutionEngine/2003-06-04-bzip2-bug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-06-04-bzip2-bug.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-06-04-bzip2-bug.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-06-04-bzip2-bug.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 

Modified: llvm/trunk/test/ExecutionEngine/2003-06-05-PHIBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-06-05-PHIBug.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-06-05-PHIBug.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-06-05-PHIBug.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; Testcase distilled from 256.bzip2.
 

Modified: llvm/trunk/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-08-15-AllocaAssertion.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; This testcase failed to work because two variable sized allocas confused the
 ; local register allocator.

Modified: llvm/trunk/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-08-21-EnvironmentTest.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ;
 ; Regression Test: EnvironmentTest.ll

Modified: llvm/trunk/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-08-23-RegisterAllocatePhysReg.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; This testcase exposes a bug in the local register allocator where it runs out
 ; of registers (due to too many overlapping live ranges), but then attempts to

Modified: llvm/trunk/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2003-10-18-PHINode-ConstantExpr-CondCode-Failure.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 @A = global i32 0		; <i32*> [#uses=1]
 

Modified: llvm/trunk/test/ExecutionEngine/2005-12-02-TailCallBug.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2005-12-02-TailCallBug.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2005-12-02-TailCallBug.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2005-12-02-TailCallBug.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,5 @@
 ; PR672
-; RUN: llvm-as < %s | lli
+; RUN: lli %s
 
 define i32 @main() {
 	%f = bitcast i32 (i32, i32*, i32)* @check_tail to i32*		; <i32*> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2007-12-10-APIntLoadStore.ll Fri Nov 12 18:28:01 2010
@@ -1,4 +1,4 @@
-; RUN: llvm-as %s -o - | lli -force-interpreter
+; RUN: lli -force-interpreter %s
 ; PR1836
 
 define i32 @main() {

Modified: llvm/trunk/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2008-06-05-APInt-OverAShr.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli -force-interpreter=true %t.bc | grep 1
+; RUN: lli -force-interpreter=true %s | grep 1
 
 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 = "i686-pc-linux-gnu"

Modified: llvm/trunk/test/ExecutionEngine/2010-01-15-UndefValue.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/2010-01-15-UndefValue.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/2010-01-15-UndefValue.ll (original)
+++ llvm/trunk/test/ExecutionEngine/2010-01-15-UndefValue.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli -force-interpreter=true %t.bc
+; RUN: lli -force-interpreter=true %s
 
 define i32 @main() {
        %a = add i32 0, undef

Modified: llvm/trunk/test/ExecutionEngine/fpbitcast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/fpbitcast.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/fpbitcast.ll (original)
+++ llvm/trunk/test/ExecutionEngine/fpbitcast.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as < %s > %t.bc
-; RUN: lli -force-interpreter=true %t.bc | grep 40091eb8
+; RUN: lli -force-interpreter=true %s | grep 40091eb8
 ;
 define i32 @test(double %x) {
 entry:

Modified: llvm/trunk/test/ExecutionEngine/hello.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/hello.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/hello.ll (original)
+++ llvm/trunk/test/ExecutionEngine/hello.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 @.LC0 = internal global [12 x i8] c"Hello World\00"		; <[12 x i8]*> [#uses=1]
 

Modified: llvm/trunk/test/ExecutionEngine/hello2.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/hello2.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/hello2.ll (original)
+++ llvm/trunk/test/ExecutionEngine/hello2.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 @X = global i32 7		; <i32*> [#uses=0]
 @msg = internal global [13 x i8] c"Hello World\0A\00"		; <[13 x i8]*> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/simplesttest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/simplesttest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/simplesttest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/simplesttest.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 	ret i32 0

Modified: llvm/trunk/test/ExecutionEngine/simpletest.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/simpletest.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/simpletest.ll (original)
+++ llvm/trunk/test/ExecutionEngine/simpletest.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @bar() {
 	ret i32 0

Modified: llvm/trunk/test/ExecutionEngine/stubs.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/stubs.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/stubs.ll (original)
+++ llvm/trunk/test/ExecutionEngine/stubs.ll Fri Nov 12 18:28:01 2010
@@ -1,4 +1,4 @@
-; RUN: llvm-as < %s | lli -disable-lazy-compilation=false
+; RUN: lli -disable-lazy-compilation=false %s
 
 define i32 @main() nounwind {
 entry:

Modified: llvm/trunk/test/ExecutionEngine/test-arith.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-arith.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-arith.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-arith.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 	%A = add i8 0, 12		; <i8> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/test-branch.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-branch.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-branch.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-branch.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; test unconditional branch
 define i32 @main() {

Modified: llvm/trunk/test/ExecutionEngine/test-call.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-call.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-call.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-call.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 declare void @exit(i32)
 

Modified: llvm/trunk/test/ExecutionEngine/test-cast.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-cast.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-cast.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-cast.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @foo() {
 	ret i32 0

Modified: llvm/trunk/test/ExecutionEngine/test-constantexpr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-constantexpr.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-constantexpr.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-constantexpr.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; This tests to make sure that we can evaluate weird constant expressions
 

Modified: llvm/trunk/test/ExecutionEngine/test-fp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-fp.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-fp.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-fp.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define double @test(double* %DP, double %Arg) {
 	%D = load double* %DP		; <double> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/test-loadstore.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-loadstore.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-loadstore.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-loadstore.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define void @test(i8* %P, i16* %P.upgrd.1, i32* %P.upgrd.2, i64* %P.upgrd.3) {
 	%V = load i8* %P		; <i8> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/test-logical.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-logical.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-logical.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-logical.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 	%A = and i8 4, 8		; <i8> [#uses=2]

Modified: llvm/trunk/test/ExecutionEngine/test-loop.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-loop.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-loop.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-loop.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 ; <label>:0

Modified: llvm/trunk/test/ExecutionEngine/test-malloc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-malloc.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-malloc.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-malloc.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 	%X = malloc i32		; <i32*> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/test-phi.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-phi.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-phi.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-phi.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; test phi node
 @Y = global i32 6		; <i32*> [#uses=1]

Modified: llvm/trunk/test/ExecutionEngine/test-ret.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-ret.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-ret.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-ret.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 ; test return instructions
 define void @test1() {

Modified: llvm/trunk/test/ExecutionEngine/test-setcond-fp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-setcond-fp.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-setcond-fp.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-setcond-fp.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 
 define i32 @main() {

Modified: llvm/trunk/test/ExecutionEngine/test-setcond-int.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-setcond-int.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-setcond-int.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-setcond-int.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 	%int1 = add i32 0, 0		; <i32> [#uses=6]

Modified: llvm/trunk/test/ExecutionEngine/test-shift.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/test-shift.ll?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/test/ExecutionEngine/test-shift.ll (original)
+++ llvm/trunk/test/ExecutionEngine/test-shift.ll Fri Nov 12 18:28:01 2010
@@ -1,5 +1,4 @@
-; RUN: llvm-as %s -o %t.bc
-; RUN: lli %t.bc > /dev/null
+; RUN: lli %s > /dev/null
 
 define i32 @main() {
 	%shamt = add i8 0, 1		; <i8> [#uses=8]

Modified: llvm/trunk/tools/lli/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/Makefile?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/tools/lli/Makefile (original)
+++ llvm/trunk/tools/lli/Makefile Fri Nov 12 18:28:01 2010
@@ -9,7 +9,7 @@
 
 LEVEL    := ../..
 TOOLNAME := lli
-LINK_COMPONENTS := jit interpreter nativecodegen bitreader selectiondag
+LINK_COMPONENTS := jit interpreter nativecodegen bitreader asmparser selectiondag
 
 # Enable JIT support
 include $(LEVEL)/Makefile.common

Modified: llvm/trunk/tools/lli/lli.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/lli/lli.cpp?rev=118952&r1=118951&r2=118952&view=diff
==============================================================================
--- llvm/trunk/tools/lli/lli.cpp (original)
+++ llvm/trunk/tools/lli/lli.cpp Fri Nov 12 18:28:01 2010
@@ -24,6 +24,7 @@
 #include "llvm/ExecutionEngine/JIT.h"
 #include "llvm/ExecutionEngine/JITEventListener.h"
 #include "llvm/Support/CommandLine.h"
+#include "llvm/Support/IRReader.h"
 #include "llvm/Support/ManagedStatic.h"
 #include "llvm/Support/MemoryBuffer.h"
 #include "llvm/Support/PluginLoader.h"
@@ -136,20 +137,15 @@
     sys::Process::PreventCoreFiles();
   
   // Load the bitcode...
-  std::string ErrorMsg;
-  Module *Mod = NULL;
-  if (MemoryBuffer *Buffer = MemoryBuffer::getFileOrSTDIN(InputFile,&ErrorMsg)){
-    Mod = getLazyBitcodeModule(Buffer, Context, &ErrorMsg);
-    if (!Mod) delete Buffer;
-  }
-  
+  SMDiagnostic Err;
+  Module *Mod = ParseIRFile(InputFile, Err, Context);
   if (!Mod) {
-    errs() << argv[0] << ": error loading program '" << InputFile << "': "
-           << ErrorMsg << "\n";
-    exit(1);
+    Err.Print(argv[0], errs());
+    return 1;
   }
 
   // If not jitting lazily, load the whole bitcode file eagerly too.
+  std::string ErrorMsg;
   if (NoLazyCompilation) {
     if (Mod->MaterializeAllPermanently(&ErrorMsg)) {
       errs() << argv[0] << ": bitcode didn't read correctly.\n";





More information about the llvm-commits mailing list