diff options
| -rw-r--r-- | llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp | 11 | ||||
| -rw-r--r-- | llvm/test/Transforms/InstCombine/getelementptr.ll | 124 | ||||
| -rw-r--r-- | llvm/test/Transforms/InstCombine/load-cmp.ll | 254 | 
3 files changed, 303 insertions, 86 deletions
diff --git a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp index c0225ae096a..4ac4753b05d 100644 --- a/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp +++ b/llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp @@ -226,8 +226,8 @@ static void ComputeUnsignedMinMaxValuesFromKnownBits(const APInt &KnownZero,  Instruction *InstCombiner::  FoldCmpLoadFromIndexedGlobal(GetElementPtrInst *GEP, GlobalVariable *GV,                               CmpInst &ICI, ConstantInt *AndCst) { -  // We need TD information to know the pointer size unless this is inbounds. -  if (!GEP->isInBounds() && TD == 0) return 0; +  if (!GEP->isInBounds()) +    return 0;    Constant *Init = GV->getInitializer();    if (!isa<ConstantArray>(Init) && !isa<ConstantDataArray>(Init)) @@ -390,13 +390,6 @@ FoldCmpLoadFromIndexedGlobal(GetElementPtrInst *GEP, GlobalVariable *GV,    // order the state machines in complexity of the generated code.    Value *Idx = GEP->getOperand(2); -  // If the index is larger than the pointer size of the target, truncate the -  // index down like the GEP would do implicitly.  We don't have to do this for -  // an inbounds GEP because the index can't be out of range. -  if (!GEP->isInBounds() && -      Idx->getType()->getPrimitiveSizeInBits() > TD->getPointerSizeInBits()) -    Idx = Builder->CreateTrunc(Idx, TD->getIntPtrType(Idx->getContext())); -    // If the comparison is only true for one or two elements, emit direct    // comparisons.    if (SecondTrueElement != Overdefined) { diff --git a/llvm/test/Transforms/InstCombine/getelementptr.ll b/llvm/test/Transforms/InstCombine/getelementptr.ll index 90f144a06fc..3033bf1a7b6 100644 --- a/llvm/test/Transforms/InstCombine/getelementptr.ll +++ b/llvm/test/Transforms/InstCombine/getelementptr.ll @@ -11,7 +11,7 @@ target datalayout = "e-p:64:64"  ; Test noop elimination  define i32* @test1(i32* %I) { -        %A = getelementptr i32* %I, i64 0  +        %A = getelementptr i32* %I, i64 0          ret i32* %A  ; CHECK-LABEL: @test1(  ; CHECK: ret i32* %I @@ -36,7 +36,7 @@ define i32* @test3(i32* %I) {  ; Test that two getelementptr insts fold  define i32* @test4({ i32 }* %I) { -        %A = getelementptr { i32 }* %I, i64 1  +        %A = getelementptr { i32 }* %I, i64 1          %B = getelementptr { i32 }* %A, i64 0, i32 0          ret i32* %B  ; CHECK-LABEL: @test4( @@ -45,7 +45,7 @@ define i32* @test4({ i32 }* %I) {  define void @test5(i8 %B) {          ; This should be turned into a constexpr instead of being an instruction -        %A = getelementptr [10 x i8]* @Global, i64 0, i64 4  +        %A = getelementptr [10 x i8]* @Global, i64 0, i64 4          store i8 %B, i8* %A          ret void  ; CHECK-LABEL: @test5( @@ -54,8 +54,8 @@ define void @test5(i8 %B) {  define i32* @test7(i32* %I, i64 %C, i64 %D) { -        %A = getelementptr i32* %I, i64 %C  -        %B = getelementptr i32* %A, i64 %D  +        %A = getelementptr i32* %I, i64 %C +        %B = getelementptr i32* %A, i64 %D          ret i32* %B  ; CHECK-LABEL: @test7(  ; CHECK: %A.sum = add i64 %C, %D @@ -64,8 +64,8 @@ define i32* @test7(i32* %I, i64 %C, i64 %D) {  define i8* @test8([10 x i32]* %X) {          ;; Fold into the cast. -        %A = getelementptr [10 x i32]* %X, i64 0, i64 0  -        %B = bitcast i32* %A to i8*      +        %A = getelementptr [10 x i32]* %X, i64 0, i64 0 +        %B = bitcast i32* %A to i8*          ret i8* %B  ; CHECK-LABEL: @test8(  ; CHECK: bitcast [10 x i32]* %X to i8* @@ -73,7 +73,7 @@ define i8* @test8([10 x i32]* %X) {  define i32 @test9() {          %A = getelementptr { i32, double }* null, i32 0, i32 1 -        %B = ptrtoint double* %A to i32         +        %B = ptrtoint double* %A to i32          ret i32 %B  ; CHECK-LABEL: @test9(  ; CHECK: ret i32 8 @@ -83,15 +83,15 @@ define i1 @test10({ i32, i32 }* %x, { i32, i32 }* %y) {          %tmp.1 = getelementptr { i32, i32 }* %x, i32 0, i32 1          %tmp.3 = getelementptr { i32, i32 }* %y, i32 0, i32 1          ;; seteq x, y -        %tmp.4 = icmp eq i32* %tmp.1, %tmp.3        +        %tmp.4 = icmp eq i32* %tmp.1, %tmp.3          ret i1 %tmp.4  ; CHECK-LABEL: @test10(  ; CHECK: icmp eq { i32, i32 }* %x, %y  }  define i1 @test11({ i32, i32 }* %X) { -        %P = getelementptr { i32, i32 }* %X, i32 0, i32 0  -        %Q = icmp eq i32* %P, null              +        %P = getelementptr { i32, i32 }* %X, i32 0, i32 0 +        %Q = icmp eq i32* %P, null          ret i1 %Q  ; CHECK-LABEL: @test11(  ; CHECK: icmp eq { i32, i32 }* %X, null @@ -105,11 +105,11 @@ entry:    store i32 10, i32* %g3, align 4    %g4 = getelementptr %struct.A* %a, i32 0, i32 0 -   +    %new_a = bitcast %struct.B* %g4 to %struct.A* -  %g5 = getelementptr %struct.A* %new_a, i32 0, i32 1	 -  %a_a = load i32* %g5, align 4	 +  %g5 = getelementptr %struct.A* %new_a, i32 0, i32 1 +  %a_a = load i32* %g5, align 4    ret i32 %a_a  ; CHECK-LABEL:      @test12(  ; CHECK:      getelementptr %struct.A* %a, i64 0, i32 1 @@ -129,8 +129,35 @@ define i1 @test13(i64 %X, %S* %P) {  ; CHECK:    %C = icmp eq i64 %X, -1  } +define i1 @test13_i32(i32 %X, %S* %P) { +; CHECK-LABEL: @test13_i32( +; CHECK: %C = icmp eq i32 %X, -1 +  %A = getelementptr inbounds %S* %P, i32 0, i32 1, i32 %X +  %B = getelementptr inbounds %S* %P, i32 0, i32 0 +  %C = icmp eq i32* %A, %B +  ret i1 %C +} + +define i1 @test13_i16(i16 %X, %S* %P) { +; CHECK-LABEL: @test13_i16( +; CHECK: %C = icmp eq i16 %X, -1 +  %A = getelementptr inbounds %S* %P, i16 0, i32 1, i16 %X +  %B = getelementptr inbounds %S* %P, i16 0, i32 0 +  %C = icmp eq i32* %A, %B +  ret i1 %C +} + +define i1 @test13_i128(i128 %X, %S* %P) { +; CHECK-LABEL: @test13_i128( +; CHECK: %C = icmp eq i64 %1, -1 +  %A = getelementptr inbounds %S* %P, i128 0, i32 1, i128 %X +  %B = getelementptr inbounds %S* %P, i128 0, i32 0 +  %C = icmp eq i32* %A, %B +  ret i1 %C +} + -@G = external global [3 x i8]       +@G = external global [3 x i8]  define i8* @test14(i32 %Idx) {          %idx = zext i32 %Idx to i64          %tmp = getelementptr i8* getelementptr ([3 x i8]* @G, i32 0, i32 0), i64 %idx @@ -151,7 +178,7 @@ define i32 *@test15(i64 %X) {  define i32* @test16(i32* %X, i32 %Idx) { -        %R = getelementptr i32* %X, i32 %Idx        +        %R = getelementptr i32* %X, i32 %Idx          ret i32* %R  ; CHECK-LABEL: @test16(  ; CHECK: sext i32 %Idx to i64 @@ -164,7 +191,7 @@ define i1 @test17(i16* %P, i32 %I, i32 %J) {          %C = icmp ult i16* %X, %Y          ret i1 %C  ; CHECK-LABEL: @test17( -; CHECK: %C = icmp slt i32 %I, %J  +; CHECK: %C = icmp slt i32 %I, %J  }  define i1 @test18(i16* %P, i32 %I) { @@ -175,6 +202,33 @@ define i1 @test18(i16* %P, i32 %I) {  ; CHECK: %C = icmp slt i32 %I, 0  } +; Smaller than pointer size +define i1 @test18_i16(i16* %P, i16 %I) { +; CHECK-LABEL: @test18_i16( +; CHECK: %C = icmp slt i16 %I, 0 +  %X = getelementptr inbounds i16* %P, i16 %I +  %C = icmp ult i16* %X, %P +  ret i1 %C +} + +; Same as pointer size +define i1 @test18_i64(i16* %P, i64 %I) { +; CHECK-LABEL: @test18_i64( +; CHECK: %C = icmp slt i64 %I, 0 +  %X = getelementptr inbounds i16* %P, i64 %I +  %C = icmp ult i16* %X, %P +  ret i1 %C +} + +; Larger than the pointer size +define i1 @test18_i128(i16* %P, i128 %I) { +; CHECK-LABEL: @test18_i128( +; CHECK: %C = icmp slt i64 %1, 0 +  %X = getelementptr inbounds i16* %P, i128 %I +  %C = icmp ult i16* %X, %P +  ret i1 %C +} +  define i32 @test19(i32* %P, i32 %A, i32 %B) {          %tmp.4 = getelementptr inbounds i32* %P, i32 %A          %tmp.9 = getelementptr inbounds i32* %P, i32 %B @@ -210,8 +264,8 @@ define i32 @test21() {  @B = global i32 2               ; <i32*> [#uses=1]  define i1 @test22() { -        %C = icmp ult i32* getelementptr (i32* @A, i64 1),  -                           getelementptr (i32* @B, i64 2)  +        %C = icmp ult i32* getelementptr (i32* @A, i64 1), +                           getelementptr (i32* @B, i64 2)          ret i1 %C  ; CHECK-LABEL: @test22(  ; CHECK: icmp ult (i32* getelementptr inbounds (i32* @A, i64 1), i32* getelementptr (i32* @B, i64 2)) @@ -262,15 +316,15 @@ define i1 @test26(i8* %arr) {  define i32 @test27(%struct.compat_siginfo* %to, %struct.siginfo_t* %from) {  entry: -	%from_addr = alloca %struct.siginfo_t*	 -	%tmp344 = load %struct.siginfo_t** %from_addr, align 8	 +	%from_addr = alloca %struct.siginfo_t* +	%tmp344 = load %struct.siginfo_t** %from_addr, align 8  	%tmp345 = getelementptr %struct.siginfo_t* %tmp344, i32 0, i32 3  	%tmp346 = getelementptr { { i32, i32, [0 x i8], %struct.sigval_t, i32 }, [88 x i8] }* %tmp345, i32 0, i32 0 -	%tmp346347 = bitcast { i32, i32, [0 x i8], %struct.sigval_t, i32 }* %tmp346 to { i32, i32, %struct.sigval_t }*	 +	%tmp346347 = bitcast { i32, i32, [0 x i8], %struct.sigval_t, i32 }* %tmp346 to { i32, i32, %struct.sigval_t }*  	%tmp348 = getelementptr { i32, i32, %struct.sigval_t }* %tmp346347, i32 0, i32 2  	%tmp349 = getelementptr %struct.sigval_t* %tmp348, i32 0, i32 0  	%tmp349350 = bitcast i8** %tmp349 to i32* -	%tmp351 = load i32* %tmp349350, align 8	 +	%tmp351 = load i32* %tmp349350, align 8  	%tmp360 = call i32 asm sideeffect "...",          "=r,ir,*m,i,0,~{dirflag},~{fpsr},~{flags}"( i32 %tmp351,           %struct.__large_struct* null, i32 -14, i32 0 ) @@ -280,28 +334,28 @@ entry:  ; PR1978  	%struct.x = type <{ i8 }> -@.str = internal constant [6 x i8] c"Main!\00"	 -@.str1 = internal constant [12 x i8] c"destroy %p\0A\00"	 +@.str = internal constant [6 x i8] c"Main!\00" +@.str1 = internal constant [12 x i8] c"destroy %p\0A\00"  define i32 @test28() nounwind  {  entry:  	%orientations = alloca [1 x [1 x %struct.x]] -	%tmp3 = call i32 @puts( i8* getelementptr ([6 x i8]* @.str, i32 0, i32 0) ) nounwind  +	%tmp3 = call i32 @puts( i8* getelementptr ([6 x i8]* @.str, i32 0, i32 0) ) nounwind  	%tmp45 = getelementptr inbounds [1 x [1 x %struct.x]]* %orientations, i32 1, i32 0, i32 0  	%orientations62 = getelementptr [1 x [1 x %struct.x]]* %orientations, i32 0, i32 0, i32 0  	br label %bb10  bb10:  	%indvar = phi i32 [ 0, %entry ], [ %indvar.next, %bb10 ] -	%tmp.0.reg2mem.0.rec = mul i32 %indvar, -1	 -	%tmp12.rec = add i32 %tmp.0.reg2mem.0.rec, -1	 +	%tmp.0.reg2mem.0.rec = mul i32 %indvar, -1 +	%tmp12.rec = add i32 %tmp.0.reg2mem.0.rec, -1  	%tmp12 = getelementptr inbounds %struct.x* %tmp45, i32 %tmp12.rec  	%tmp16 = call i32 (i8*, ...)* @printf( i8* getelementptr ([12 x i8]* @.str1, i32 0, i32 0), %struct.x* %tmp12 ) nounwind  	%tmp84 = icmp eq %struct.x* %tmp12, %orientations62  	%indvar.next = add i32 %indvar, 1  	br i1 %tmp84, label %bb17, label %bb10 -bb17:	 +bb17:  	ret i32 0  ; CHECK-LABEL: @test28(  ; CHECK: icmp eq i32 %indvar, 0 @@ -318,7 +372,7 @@ declare i32 @printf(i8*, ...)  	%T = type <{ i64, i64, i64 }>  define i32 @test29(i8* %start, i32 %X) nounwind {  entry: -	%tmp3 = load i64* null		 +	%tmp3 = load i64* null  	%add.ptr = getelementptr i8* %start, i64 %tmp3  	%tmp158 = load i32* null  	%add.ptr159 = getelementptr %T* null, i32 %tmp158 @@ -356,7 +410,7 @@ declare void @test30f(i32*)  define i1 @test31(i32* %A) {          %B = getelementptr i32* %A, i32 1          %C = getelementptr i32* %A, i64 1 -        %V = icmp eq i32* %B, %C  +        %V = icmp eq i32* %B, %C          ret i1 %V  ; CHECK-LABEL: @test31(  ; CHECK: ret i1 true @@ -372,7 +426,7 @@ define i8* @test32(i8* %v) {  	%D = getelementptr { [16 x i8] }* %C, i32 0, i32 0, i32 8  	%E = bitcast i8* %D to i8**  	store i8* %v, i8** %E -	%F = getelementptr [4 x i8*]* %A, i32 0, i32 2	 +	%F = getelementptr [4 x i8*]* %A, i32 0, i32 2  	%G = load i8** %F  	ret i8* %G  ; CHECK-LABEL: @test32( @@ -386,7 +440,7 @@ define i8* @test32(i8* %v) {  define i32 *@test33(%struct.Key *%A) {  	%B = bitcast %struct.Key* %A to %struct.anon* -        %C = getelementptr %struct.anon* %B, i32 0, i32 2  +        %C = getelementptr %struct.anon* %B, i32 0, i32 2  	ret i32 *%C  ; CHECK-LABEL: @test33(  ; CHECK: getelementptr %struct.Key* %A, i64 0, i32 0, i32 1 @@ -397,10 +451,10 @@ define i32 *@test33(%struct.Key *%A) {  	%T2 = type { i8*, i8 }  define i8* @test34(i8* %Val, i64 %V) nounwind {  entry: -	%A = alloca %T2, align 8	 +	%A = alloca %T2, align 8  	%mrv_gep = bitcast %T2* %A to i64*  	%B = getelementptr %T2* %A, i64 0, i32 0 -         +        	store i64 %V, i64* %mrv_gep  	%C = load i8** %B, align 8  	ret i8* %C diff --git a/llvm/test/Transforms/InstCombine/load-cmp.ll b/llvm/test/Transforms/InstCombine/load-cmp.ll index 95dc48cf03f..a69283cc14e 100644 --- a/llvm/test/Transforms/InstCombine/load-cmp.ll +++ b/llvm/test/Transforms/InstCombine/load-cmp.ll @@ -1,18 +1,45 @@ -; RUN: opt < %s -instcombine -S | FileCheck %s +; RUN: opt -instcombine -S < %s | FileCheck -check-prefix=NODL %s +; RUN: opt -instcombine -S -default-data-layout="p:32:32:32-n8:16:32:64" < %s | FileCheck -check-prefix=P32 %s -@G16 = internal constant [10 x i16] [i16 35, i16 82, i16 69, i16 81, i16 85,  +@G16 = internal constant [10 x i16] [i16 35, i16 82, i16 69, i16 81, i16 85,                                       i16 73, i16 82, i16 69, i16 68, i16 0]  @GD = internal constant [6 x double]     [double -10.0, double 1.0, double 4.0, double 2.0, double -20.0, double -40.0] +%Foo = type { i32, i32, i32, i32 } + +@GS = internal constant %Foo { i32 1, i32 4, i32 9, i32 14 } + +@GStructArr = internal constant [4 x %Foo] [ %Foo { i32 1, i32 4, i32 9, i32 14 }, +                                             %Foo { i32 5, i32 4, i32 6, i32 11 }, +                                             %Foo { i32 6, i32 5, i32 9, i32 20 }, +                                             %Foo { i32 12, i32 3, i32 9, i32 8 } ] + +  define i1 @test1(i32 %X) {    %P = getelementptr inbounds [10 x i16]* @G16, i32 0, i32 %X    %Q = load i16* %P    %R = icmp eq i16 %Q, 0    ret i1 %R -; CHECK-LABEL: @test1( -; CHECK-NEXT: %R = icmp eq i32 %X, 9 -; CHECK-NEXT: ret i1 %R +; NODL-LABEL: @test1( +; NODL-NEXT: %R = icmp eq i32 %X, 9 +; NODL-NEXT: ret i1 %R + +; P32-LABEL: @test1( +; P32-NEXT: %R = icmp eq i32 %X, 9 +; P32-NEXT: ret i1 %R +} + +define i1 @test1_noinbounds(i32 %X) { +  %P = getelementptr [10 x i16]* @G16, i32 0, i32 %X +  %Q = load i16* %P +  %R = icmp eq i16 %Q, 0 +  ret i1 %R +; NODL-LABEL: @test1_noinbounds( +; NODL-NEXT: %P = getelementptr [10 x i16]* @G16, i32 0, i32 %X + +; P32-LABEL: @test1_noinbounds( +; P32-NEXT: %P = getelementptr [10 x i16]* @G16, i32 0, i32 %X  }  define i1 @test2(i32 %X) { @@ -20,9 +47,9 @@ define i1 @test2(i32 %X) {    %Q = load i16* %P    %R = icmp slt i16 %Q, 85    ret i1 %R -; CHECK-LABEL: @test2( -; CHECK-NEXT: %R = icmp ne i32 %X, 4 -; CHECK-NEXT: ret i1 %R +; NODL-LABEL: @test2( +; NODL-NEXT: %R = icmp ne i32 %X, 4 +; NODL-NEXT: ret i1 %R  }  define i1 @test3(i32 %X) { @@ -30,9 +57,14 @@ define i1 @test3(i32 %X) {    %Q = load double* %P    %R = fcmp oeq double %Q, 1.0    ret i1 %R -; CHECK-LABEL: @test3( -; CHECK-NEXT: %R = icmp eq i32 %X, 1 -; CHECK-NEXT: ret i1 %R +; NODL-LABEL: @test3( +; NODL-NEXT: %R = icmp eq i32 %X, 1 +; NODL-NEXT: ret i1 %R + +; P32-LABEL: @test3( +; P32-NEXT: %R = icmp eq i32 %X, 1 +; P32-NEXT: ret i1 %R +  }  define i1 @test4(i32 %X) { @@ -40,11 +72,17 @@ define i1 @test4(i32 %X) {    %Q = load i16* %P    %R = icmp sle i16 %Q, 73    ret i1 %R -; CHECK-LABEL: @test4( -; CHECK-NEXT: lshr i32 933, %X -; CHECK-NEXT: and i32 {{.*}}, 1 -; CHECK-NEXT: %R = icmp ne i32 {{.*}}, 0 -; CHECK-NEXT: ret i1 %R +; NODL-LABEL: @test4( +; NODL-NEXT: lshr i32 933, %X +; NODL-NEXT: and i32 {{.*}}, 1 +; NODL-NEXT: %R = icmp ne i32 {{.*}}, 0 +; NODL-NEXT: ret i1 %R + +; P32-LABEL: @test4( +; P32-NEXT: lshr i32 933, %X +; P32-NEXT: and i32 {{.*}}, 1 +; P32-NEXT: %R = icmp ne i32 {{.*}}, 0 +; P32-NEXT: ret i1 %R  }  define i1 @test4_i16(i16 %X) { @@ -52,11 +90,19 @@ define i1 @test4_i16(i16 %X) {    %Q = load i16* %P    %R = icmp sle i16 %Q, 73    ret i1 %R -; CHECK-LABEL: @test4_i16( -; CHECK-NEXT: lshr i16 933, %X -; CHECK-NEXT: and i16 {{.*}}, 1 -; CHECK-NEXT: %R = icmp ne i16 {{.*}}, 0 -; CHECK-NEXT: ret i1 %R + +; NODL-LABEL: @test4_i16( +; NODL-NEXT: lshr i16 933, %X +; NODL-NEXT: and i16 {{.*}}, 1 +; NODL-NEXT: %R = icmp ne i16 {{.*}}, 0 +; NODL-NEXT: ret i1 %R + +; P32-LABEL: @test4_i16( +; P32-NEXT: sext i16 %X to i32 +; P32-NEXT: lshr i32 933, %1 +; P32-NEXT: and i32 {{.*}}, 1 +; P32-NEXT: %R = icmp ne i32 {{.*}}, 0 +; P32-NEXT: ret i1 %R  }  define i1 @test5(i32 %X) { @@ -64,11 +110,17 @@ define i1 @test5(i32 %X) {    %Q = load i16* %P    %R = icmp eq i16 %Q, 69    ret i1 %R -; CHECK-LABEL: @test5( -; CHECK-NEXT: icmp eq i32 %X, 2 -; CHECK-NEXT: icmp eq i32 %X, 7 -; CHECK-NEXT: %R = or i1 -; CHECK-NEXT: ret i1 %R +; NODL-LABEL: @test5( +; NODL-NEXT: icmp eq i32 %X, 2 +; NODL-NEXT: icmp eq i32 %X, 7 +; NODL-NEXT: %R = or i1 +; NODL-NEXT: ret i1 %R + +; P32-LABEL: @test5( +; P32-NEXT: icmp eq i32 %X, 2 +; P32-NEXT: icmp eq i32 %X, 7 +; P32-NEXT: %R = or i1 +; P32-NEXT: ret i1 %R  }  define i1 @test6(i32 %X) { @@ -76,10 +128,15 @@ define i1 @test6(i32 %X) {    %Q = load double* %P    %R = fcmp ogt double %Q, 0.0    ret i1 %R -; CHECK-LABEL: @test6( -; CHECK-NEXT: add i32 %X, -1 -; CHECK-NEXT: %R = icmp ult i32 {{.*}}, 3 -; CHECK-NEXT: ret i1 %R +; NODL-LABEL: @test6( +; NODL-NEXT: add i32 %X, -1 +; NODL-NEXT: %R = icmp ult i32 {{.*}}, 3 +; NODL-NEXT: ret i1 %R + +; P32-LABEL: @test6( +; P32-NEXT: add i32 %X, -1 +; P32-NEXT: %R = icmp ult i32 {{.*}}, 3 +; P32-NEXT: ret i1 %R  }  define i1 @test7(i32 %X) { @@ -87,10 +144,15 @@ define i1 @test7(i32 %X) {    %Q = load double* %P    %R = fcmp olt double %Q, 0.0    ret i1 %R -; CHECK-LABEL: @test7( -; CHECK-NEXT: add i32 %X, -1 -; CHECK-NEXT: %R = icmp ugt i32 {{.*}}, 2 -; CHECK-NEXT: ret i1 %R +; NODL-LABEL: @test7( +; NODL-NEXT: add i32 %X, -1 +; NODL-NEXT: %R = icmp ugt i32 {{.*}}, 2 +; NODL-NEXT: ret i1 %R + +; P32-LABEL: @test7( +; P32-NEXT: add i32 %X, -1 +; P32-NEXT: %R = icmp ugt i32 {{.*}}, 2 +; P32-NEXT: ret i1 %R  }  define i1 @test8(i32 %X) { @@ -99,10 +161,15 @@ define i1 @test8(i32 %X) {    %R = and i16 %Q, 3    %S = icmp eq i16 %R, 0    ret i1 %S -; CHECK-LABEL: @test8( -; CHECK-NEXT: and i32 %X, -2 -; CHECK-NEXT: icmp eq i32 {{.*}}, 8 -; CHECK-NEXT: ret i1 +; NODL-LABEL: @test8( +; NODL-NEXT: and i32 %X, -2 +; NODL-NEXT: icmp eq i32 {{.*}}, 8 +; NODL-NEXT: ret i1 + +; P32-LABEL: @test8( +; P32-NEXT: and i32 %X, -2 +; P32-NEXT: icmp eq i32 {{.*}}, 8 +; P32-NEXT: ret i1  }  @GA = internal constant [4 x { i32, i32 } ] [ @@ -117,8 +184,111 @@ define i1 @test9(i32 %X) {    %Q = load i32* %P    %R = icmp eq i32 %Q, 1    ret i1 %R -; CHECK-LABEL: @test9( -; CHECK-NEXT: add i32 %X, -1 -; CHECK-NEXT: icmp ult i32 {{.*}}, 2 -; CHECK-NEXT: ret i1 +; NODL-LABEL: @test9( +; NODL-NEXT: add i32 %X, -1 +; NODL-NEXT: icmp ult i32 {{.*}}, 2 +; NODL-NEXT: ret i1 + +; P32-LABEL: @test9( +; P32-NEXT: add i32 %X, -1 +; P32-NEXT: icmp ult i32 {{.*}}, 2 +; P32-NEXT: ret i1  } + +define i1 @test10_struct(i32 %x) { +; NODL-LABEL: @test10_struct( +; NODL: getelementptr inbounds %Foo* @GS, i32 %x, i32 0 + +; P32-LABEL: @test10_struct( +; P32: getelementptr inbounds %Foo* @GS, i32 %x, i32 0 +  %p = getelementptr inbounds %Foo* @GS, i32 %x, i32 0 +  %q = load i32* %p +  %r = icmp eq i32 %q, 9 +  ret i1 %r +} + +define i1 @test10_struct_noinbounds(i32 %x) { +; NODL-LABEL: @test10_struct_noinbounds( +; NODL: getelementptr %Foo* @GS, i32 %x, i32 0 + +; P32-LABEL: @test10_struct_noinbounds( +; P32: getelementptr %Foo* @GS, i32 %x, i32 0 +  %p = getelementptr %Foo* @GS, i32 %x, i32 0 +  %q = load i32* %p +  %r = icmp eq i32 %q, 9 +  ret i1 %r +} + +; Test that the GEP indices are converted before we ever get here +; Index < ptr size +define i1 @test10_struct_i16(i16 %x){ +; NODL-LABEL: @test10_struct_i16( +; NODL: getelementptr inbounds %Foo* @GS, i16 %x, i32 0 + +; P32-LABEL: @test10_struct_i16( +; P32: %1 = sext i16 %x to i32 +; P32: getelementptr inbounds %Foo* @GS, i32 %1, i32 0 +  %p = getelementptr inbounds %Foo* @GS, i16 %x, i32 0 +  %q = load i32* %p +  %r = icmp eq i32 %q, 0 +  ret i1 %r +} + +; Test that the GEP indices are converted before we ever get here +; Index > ptr size +define i1 @test10_struct_i64(i64 %x){ +; NODL-LABEL: @test10_struct_i64( +; NODL: getelementptr inbounds %Foo* @GS, i64 %x, i32 0 + +; P32-LABEL: @test10_struct_i64( +; P32: %1 = trunc i64 %x to i32 +; P32: getelementptr inbounds %Foo* @GS, i32 %1, i32 0 +  %p = getelementptr inbounds %Foo* @GS, i64 %x, i32 0 +  %q = load i32* %p +  %r = icmp eq i32 %q, 0 +  ret i1 %r +} + +define i1 @test10_struct_arr(i32 %x) { +; NODL-LABEL: @test10_struct_arr( +; NODL-NEXT: %r = icmp ne i32 %x, 1 +; NODL-NEXT: ret i1 %r + +; P32-LABEL: @test10_struct_arr( +; P32-NEXT: %r = icmp ne i32 %x, 1 +; P32-NEXT: ret i1 %r +  %p = getelementptr inbounds [4 x %Foo]* @GStructArr, i32 0, i32 %x, i32 2 +  %q = load i32* %p +  %r = icmp eq i32 %q, 9 +  ret i1 %r +} + +define i1 @test10_struct_arr_i16(i16 %x) { +; NODL-LABEL: @test10_struct_arr_i16( +; NODL-NEXT: %r = icmp ne i16 %x, 1 +; NODL-NEXT: ret i1 %r + +; P32-LABEL: @test10_struct_arr_i16( +; P32-NEXT: %r = icmp ne i16 %x, 1 +; P32-NEXT: ret i1 %r +  %p = getelementptr inbounds [4 x %Foo]* @GStructArr, i16 0, i16 %x, i32 2 +  %q = load i32* %p +  %r = icmp eq i32 %q, 9 +  ret i1 %r +} + +define i1 @test10_struct_arr_i64(i64 %x) { +; NODL-LABEL: @test10_struct_arr_i64( +; NODL-NEXT: %r = icmp ne i64 %x, 1 +; NODL-NEXT: ret i1 %r + +; P32-LABEL: @test10_struct_arr_i64( +; P32-NEXT: trunc i64 %x to i32 +; P32-NEXT: %r = icmp ne i32 %1, 1 +; P32-NEXT: ret i1 %r +  %p = getelementptr inbounds [4 x %Foo]* @GStructArr, i64 0, i64 %x, i32 2 +  %q = load i32* %p +  %r = icmp eq i32 %q, 9 +  ret i1 %r +} +  | 

