Index: llvm/trunk/test/CodeGen/ARM/long-setcc.ll =================================================================== --- llvm/trunk/test/CodeGen/ARM/long-setcc.ll +++ llvm/trunk/test/CodeGen/ARM/long-setcc.ll @@ -1,20 +1,27 @@ ; RUN: llc -mtriple=arm-eabi < %s | FileCheck %s define i1 @t1(i64 %x) { +; CHECK-LABEL: t1: +; CHECK: lsr r0, r1, #31 %B = icmp slt i64 %x, 0 ret i1 %B } define i1 @t2(i64 %x) { +; CHECK-LABEL: t2: +; CHECK: mov r0, #0 +; CHECK: cmp r1, #0 +; CHECK: moveq r0, #1 %tmp = icmp ult i64 %x, 4294967296 ret i1 %tmp } define i1 @t3(i32 %x) { +; CHECK-LABEL: t3: +; CHECK: mov r0, #0 %tmp = icmp ugt i32 %x, -1 ret i1 %tmp } -; CHECK: cmp ; CHECK-NOT: cmp Index: llvm/trunk/test/CodeGen/ARM/select-imm.ll =================================================================== --- llvm/trunk/test/CodeGen/ARM/select-imm.ll +++ llvm/trunk/test/CodeGen/ARM/select-imm.ll @@ -3,9 +3,15 @@ ; RUN: llc -mtriple=arm-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - \ ; RUN: | FileCheck %s --check-prefix=ARMT2 +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-m0 %s -o - \ +; RUN: | FileCheck %s --check-prefix=THUMB1 + ; RUN: llc -mtriple=thumb-eabi -mcpu=arm1156t2-s -mattr=+thumb2 %s -o - \ ; RUN: | FileCheck %s --check-prefix=THUMB2 +; RUN: llc -mtriple=thumbv8m.base-eabi %s -o - \ +; RUN: | FileCheck %s --check-prefix=V8MBASE + define i32 @t1(i32 %c) nounwind readnone { entry: ; ARM-LABEL: t1: @@ -17,6 +23,14 @@ ; ARMT2: movw [[R:r[0-1]]], #357 ; ARMT2: movwgt [[R]], #123 +; THUMB1-LABEL: t1: +; THUMB1: mov r1, r0 +; THUMB1: movs r2, #255 +; THUMB1: adds r2, #102 +; THUMB1: movs r0, #123 +; THUMB1: cmp r1, #1 +; THUMB1: bgt + ; THUMB2-LABEL: t1: ; THUMB2: movw [[R:r[0-1]]], #357 ; THUMB2: movgt [[R]], #123 @@ -37,6 +51,10 @@ ; ARMT2: mov [[R:r[0-1]]], #123 ; ARMT2: movwgt [[R]], #357 +; THUMB1-LABEL: t2: +; THUMB1: cmp r{{[0-9]+}}, #1 +; THUMB1: bgt + ; THUMB2-LABEL: t2: ; THUMB2: mov{{(s|\.w)}} [[R:r[0-1]]], #123 ; THUMB2: movwgt [[R]], #357 @@ -56,6 +74,13 @@ ; ARMT2: mov [[R:r[0-1]]], #0 ; ARMT2: movweq [[R]], #1 +; THUMB1-LABEL: t3: +; THUMB1: mov r1, r0 +; THUMB1: movs r0, #1 +; THUMB1: movs r2, #0 +; THUMB1: cmp r1, #160 +; THUMB1: beq + ; THUMB2-LABEL: t3: ; THUMB2: mov{{(s|\.w)}} [[R:r[0-1]]], #0 ; THUMB2: moveq [[R]], #1 @@ -74,6 +99,10 @@ ; ARMT2: movwlt [[R0:r[0-9]+]], #65365 ; ARMT2: movtlt [[R0]], #65365 +; THUMB1-LABEL: t4: +; THUMB1: cmp r{{[0-9]+}}, r{{[0-9]+}} +; THUMB1: b{{lt|ge}} + ; THUMB2-LABEL: t4: ; THUMB2: mvnlt [[R0:r[0-9]+]], #11141290 %0 = icmp slt i32 %a, %b @@ -90,6 +119,12 @@ ; ARM-NOT: mov ; ARM: movne r0, #0 +; THUMB1-LABEL: t5: +; THUMB1: mov r1, r0 +; THUMB1: movs r0, #0 +; THUMB1: cmp r1, #1 +; THUMB1: bne + ; THUMB2-LABEL: t5: ; THUMB2-NOT: mov ; THUMB2: cmp r0, #1 @@ -107,6 +142,10 @@ ; ARM: cmp r0, #0 ; ARM: movne r0, #1 +; THUMB1-LABEL: t6: +; THUMB1: cmp r{{[0-9]+}}, #0 +; THUMB1: bne + ; THUMB2-LABEL: t6: ; THUMB2-NOT: mov ; THUMB2: cmp r0, #0 @@ -116,3 +155,202 @@ %lnot.ext = zext i1 %tobool to i32 ret i32 %lnot.ext } + +define i32 @t7(i32 %a, i32 %b) nounwind readnone { +entry: +; ARM-LABEL: t7: +; ARM: mov r2, #0 +; ARM: cmp r0, r1 +; ARM: movne r2, #1 +; ARM: lsl r0, r2, #2 + +; ARMT2-LABEL: t7: +; ARMT2: mov r2, #0 +; ARMT2: cmp r0, r1 +; ARMT2: movwne r2, #1 +; ARMT2: lsl r0, r2, #2 + +; THUMB1-LABEL: t7: +; THUMB1: movs r2, #1 +; THUMB1: movs r3, #0 +; THUMB1: cmp r0, r1 +; THUMB1: bne .LBB6_2 +; THUMB1: mov r2, r3 +; THUMB1: .LBB6_2: +; THUMB1: lsls r0, r2, #2 + +; THUMB2-LABEL: t7: +; THUMB2: movs r2, #0 +; THUMB2: cmp r0, r1 +; THUMB2: it ne +; THUMB2: movne r2, #1 +; THUMB2: lsls r0, r2, #2 + %0 = icmp ne i32 %a, %b + %1 = select i1 %0, i32 4, i32 0 + ret i32 %1 +} + +define void @t8(i32 %a) { +entry: + +; ARM scheduler emits icmp/zext before both calls, so isn't relevant + +; ARMT2-LABEL: t8: +; ARMT2: mov r1, r0 +; ARMT2: mov r0, #9 +; ARMT2: mov r4, #0 +; ARMT2: cmp r1, #5 +; ARMT2: movweq r4, #1 +; ARMT2: bl t7 + +; THUMB1-LABEL: t8: +; THUMB1: mov r1, r0 +; THUMB1: movs r4, #1 +; THUMB1: movs r0, #0 +; THUMB1: cmp r1, #5 +; THUMB1: beq .LBB7_2 +; THUMB1: mov r4, r0 + +; THUMB2-LABEL: t8: +; THUMB2: mov r1, r0 +; THUMB2: movs r4, #0 +; THUMB2: cmp r1, #5 +; THUMB2: it eq +; THUMB2: moveq r4, #1 + %cmp = icmp eq i32 %a, 5 + %conv = zext i1 %cmp to i32 + %call = tail call i32 @t7(i32 9, i32 %a) + tail call i32 @t7(i32 %conv, i32 %call) + ret void +} + +define void @t9(i8* %a, i8 %b) { +entry: + +; ARM scheduler emits icmp/zext before both calls, so isn't relevant + +; ARMT2-LABEL: t9: +; ARMT2: cmp r4, r4 +; ARMT2: movweq r0, #1 + +; THUMB1-LABEL: t9: +; THUMB1: cmp r4, r4 +; THUMB1: beq .LBB8_2 +; THUMB1: mov r0, r1 + +; THUMB2-LABEL: t9: +; THUMB2: cmp r4, r4 +; THUMB2: it eq +; THUMB2: moveq r0, #1 + + %0 = load i8, i8* %a + %conv = sext i8 %0 to i32 + %conv119 = zext i8 %0 to i32 + %conv522 = and i32 %conv, 255 + %cmp723 = icmp eq i32 %conv522, %conv119 + tail call void @f(i1 zeroext %cmp723) + br i1 %cmp723, label %while.body, label %while.end + +while.body: ; preds = %entry, %while.body + %ref.025 = phi i8 [ %inc9, %while.body ], [ %0, %entry ] + %in.024 = phi i32 [ %inc, %while.body ], [ %conv, %entry ] + %inc = add i32 %in.024, 1 + %inc9 = add i8 %ref.025, 1 + %conv1 = zext i8 %inc9 to i32 + %cmp = icmp slt i32 %conv1, %conv119 + %conv5 = and i32 %inc, 255 + br i1 %cmp, label %while.body, label %while.end + +while.end: + ret void +} + +declare void @f(i1 zeroext) + + +define i1 @t10() { +entry: + %q = alloca i32 + %p = alloca i32 + store i32 -3, i32* %q + store i32 -8, i32* %p + %0 = load i32, i32* %q + %1 = load i32, i32* %p + %div = sdiv i32 %0, %1 + %mul = mul nsw i32 %div, %1 + %rem = srem i32 %0, %1 + %add = add nsw i32 %mul, %rem + %cmp = icmp eq i32 %add, %0 + ret i1 %cmp + +; ARM-LABEL: t10: +; ARM: mov r0, #0 +; ARM: cmn r1, #3 +; ARM: moveq r0, #1 + +; ARMT2-LABEL: t10: +; ARMT2: mov r0, #0 +; ARMT2: cmn r1, #3 +; ARMT2: movweq r0, #1 + +; THUMB1-LABEL: t10: +; THUMB1: movs r0, #1 +; THUMB1: movs r1, #0 +; THUMB1: cmp r2, r5 +; THUMB1: beq .LBB9_2 +; THUMB1: mov r0, r1 + +; THUMB2-LABEL: t10: +; THUMB2: adds r0, #3 +; THUMB2: mov.w r0, #0 +; THUMB2: it eq +; THUMB2: moveq r0, #1 + +; V8MBASE-LABEL: t10: +; V8MBASE-NOT: movs r0, #0 +; V8MBASE: movs r0, #7 +} + +define i1 @t11() { +entry: + %bit = alloca i32 + %load = load i32, i32* %bit + %clear = and i32 %load, -4096 + %set = or i32 %clear, 33 + store i32 %set, i32* %bit + %load1 = load i32, i32* %bit + %clear2 = and i32 %load1, -33550337 + %set3 = or i32 %clear2, 40960 + %clear5 = and i32 %set3, 4095 + %rem = srem i32 %clear5, 10 + %clear9 = and i32 %set3, -4096 + %set10 = or i32 %clear9, %rem + store i32 %set10, i32* %bit + %clear12 = and i32 %set10, 4095 + %cmp = icmp eq i32 %clear12, 3 + ret i1 %cmp + +; ARM-LABEL: t11: +; ARM: mov r0, #0 +; ARM: cmp r1, #3 +; ARM: moveq r0, #1 + +; ARMT2-LABEL: t11: +; ARMT2: mov r0, #0 +; ARMT2: cmp r1, #3 +; ARMT2: movweq r0, #1 + +; THUMB1-LABEL: t11: +; THUMB1-NOT: movs r0, #0 +; THUMB1: movs r0, #5 + +; THUMB2-LABEL: t11: +; THUMB2: movs r0, #0 +; THUMB2: cmp r1, #3 +; THUMB2: it eq +; THUMB2: moveq r0, #1 + +; V8MBASE-LABEL: t11: +; V8MBASE-NOT: movs r0, #0 +; V8MBASE: movw r0, #40960 +} Index: llvm/trunk/test/CodeGen/Thumb/branchless-cmp.ll =================================================================== --- llvm/trunk/test/CodeGen/Thumb/branchless-cmp.ll +++ llvm/trunk/test/CodeGen/Thumb/branchless-cmp.ll @@ -0,0 +1,149 @@ +; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py +; RUN: llc -mtriple=thumb-eabi -mcpu=cortex-m0 %s -verify-machineinstrs -o - | FileCheck %s + +define i32 @test1a(i32 %a, i32 %b) { +; CHECK-LABEL: test1a: +; CHECK: @ %bb.0: @ %entry +; CHECK-NEXT: mov r2, r0 +; CHECK-NEXT: movs r0, #1 +; CHECK-NEXT: movs r3, #0 +; CHECK-NEXT: cmp r2, r1 +; CHECK-NEXT: bne .LBB0_2 +; CHECK-NEXT: @ %bb.1: @ %entry +; CHECK-NEXT: mov r0, r3 +; CHECK-NEXT: .LBB0_2: @ %entry +; CHECK-NEXT: bx lr +entry: + %cmp = icmp ne i32 %a, %b + %cond = zext i1 %cmp to i32 + ret i32 %cond +} + +define i32 @test1b(i32 %a, i32 %b) { +; CHECK-LABEL: test1b: +; CHECK: @ %bb.0: @ %entry +; CHECK-NEXT: mov r2, r0 +; CHECK-NEXT: movs r0, #1 +; CHECK-NEXT: movs r3, #0 +; CHECK-NEXT: cmp r2, r1 +; CHECK-NEXT: beq .LBB1_2 +; CHECK-NEXT: @ %bb.1: @ %entry +; CHECK-NEXT: mov r0, r3 +; CHECK-NEXT: .LBB1_2: @ %entry +; CHECK-NEXT: bx lr +entry: + %cmp = icmp eq i32 %a, %b + %cond = zext i1 %cmp to i32 + ret i32 %cond +} + +define i32 @test2a(i32 %a, i32 %b) { +; CHECK-LABEL: test2a: +; CHECK: @ %bb.0: @ %entry +; CHECK-NEXT: mov r2, r0 +; CHECK-NEXT: movs r0, #1 +; CHECK-NEXT: movs r3, #0 +; CHECK-NEXT: cmp r2, r1 +; CHECK-NEXT: beq .LBB2_2 +; CHECK-NEXT: @ %bb.1: @ %entry +; CHECK-NEXT: mov r0, r3 +; CHECK-NEXT: .LBB2_2: @ %entry +; CHECK-NEXT: bx lr +entry: + %cmp = icmp eq i32 %a, %b + %cond = zext i1 %cmp to i32 + ret i32 %cond +} + +define i32 @test2b(i32 %a, i32 %b) { +; CHECK-LABEL: test2b: +; CHECK: @ %bb.0: @ %entry +; CHECK-NEXT: mov r2, r0 +; CHECK-NEXT: movs r0, #1 +; CHECK-NEXT: movs r3, #0 +; CHECK-NEXT: cmp r2, r1 +; CHECK-NEXT: bne .LBB3_2 +; CHECK-NEXT: @ %bb.1: @ %entry +; CHECK-NEXT: mov r0, r3 +; CHECK-NEXT: .LBB3_2: @ %entry +; CHECK-NEXT: bx lr +entry: + %cmp = icmp ne i32 %a, %b + %cond = zext i1 %cmp to i32 + ret i32 %cond +} + +define i32 @test3a(i32 %a, i32 %b) { +; CHECK-LABEL: test3a: +; CHECK: @ %bb.0: @ %entry +; CHECK-NEXT: mov r2, r0 +; CHECK-NEXT: movs r0, #0 +; CHECK-NEXT: movs r3, #4 +; CHECK-NEXT: cmp r2, r1 +; CHECK-NEXT: beq .LBB4_2 +; CHECK-NEXT: @ %bb.1: @ %entry +; CHECK-NEXT: mov r0, r3 +; CHECK-NEXT: .LBB4_2: @ %entry +; CHECK-NEXT: bx lr +entry: + %cmp = icmp eq i32 %a, %b + %cond = select i1 %cmp, i32 0, i32 4 + ret i32 %cond +} + +define i32 @test3b(i32 %a, i32 %b) { +; CHECK-LABEL: test3b: +; CHECK: @ %bb.0: @ %entry +; CHECK-NEXT: movs r2, #1 +; CHECK-NEXT: movs r3, #0 +; CHECK-NEXT: cmp r0, r1 +; CHECK-NEXT: beq .LBB5_2 +; CHECK-NEXT: @ %bb.1: @ %entry +; CHECK-NEXT: mov r2, r3 +; CHECK-NEXT: .LBB5_2: @ %entry +; CHECK-NEXT: lsls r0, r2, #2 +; CHECK-NEXT: bx lr +entry: + %cmp = icmp eq i32 %a, %b + %cond = select i1 %cmp, i32 4, i32 0 + ret i32 %cond +} + +; FIXME: This one hasn't changed actually +; but could look like test3b +define i32 @test4a(i32 %a, i32 %b) { +; CHECK-LABEL: test4a: +; CHECK: @ %bb.0: @ %entry +; CHECK-NEXT: mov r2, r0 +; CHECK-NEXT: movs r0, #0 +; CHECK-NEXT: movs r3, #4 +; CHECK-NEXT: cmp r2, r1 +; CHECK-NEXT: bne .LBB6_2 +; CHECK-NEXT: @ %bb.1: @ %entry +; CHECK-NEXT: mov r0, r3 +; CHECK-NEXT: .LBB6_2: @ %entry +; CHECK-NEXT: bx lr +entry: + %cmp = icmp ne i32 %a, %b + %cond = select i1 %cmp, i32 0, i32 4 + ret i32 %cond +} + +define i32 @test4b(i32 %a, i32 %b) { +; CHECK-LABEL: test4b: +; CHECK: @ %bb.0: @ %entry +; CHECK-NEXT: movs r2, #1 +; CHECK-NEXT: movs r3, #0 +; CHECK-NEXT: cmp r0, r1 +; CHECK-NEXT: bne .LBB7_2 +; CHECK-NEXT: @ %bb.1: @ %entry +; CHECK-NEXT: mov r2, r3 +; CHECK-NEXT: .LBB7_2: @ %entry +; CHECK-NEXT: lsls r0, r2, #2 +; CHECK-NEXT: bx lr +entry: + %cmp = icmp ne i32 %a, %b + %cond = select i1 %cmp, i32 4, i32 0 + ret i32 %cond +} + Index: llvm/trunk/test/CodeGen/Thumb/long-setcc.ll =================================================================== --- llvm/trunk/test/CodeGen/Thumb/long-setcc.ll +++ llvm/trunk/test/CodeGen/Thumb/long-setcc.ll @@ -1,22 +1,28 @@ ; RUN: llc -mtriple=thumb-eabi < %s | FileCheck %s define i1 @t1(i64 %x) { - %B = icmp slt i64 %x, 0 - ret i1 %B +; CHECK-LABEL: t1: +; CHECK: lsrs r0, r1, #31 + %B = icmp slt i64 %x, 0 + ret i1 %B } define i1 @t2(i64 %x) { - %tmp = icmp ult i64 %x, 4294967296 - ret i1 %tmp +; CHECK-LABEL: t2: +; CHECK: movs r0, #1 +; CHECK: movs r2, #0 +; CHECK: cmp r1, #0 +; CHECK: beq .LBB1_2 + %tmp = icmp ult i64 %x, 4294967296 + ret i1 %tmp } define i1 @t3(i32 %x) { - %tmp = icmp ugt i32 %x, -1 - ret i1 %tmp +; CHECK-LABEL: t3: +; CHECK: movs r0, #0 + %tmp = icmp ugt i32 %x, -1 + ret i1 %tmp } -; CHECK: cmp -; CHECK-NOT: cmp - - +; CHECK-NOT: cmp