diff options
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp | 2 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/ctpop-combine.ll | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp index 1621d61ba9b..514f175ee09 100644 --- a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp @@ -1876,7 +1876,7 @@ TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1, CTPOP = N0.getOperand(0); if (CTPOP.hasOneUse() && CTPOP.getOpcode() == ISD::CTPOP && - (N0 == CTPOP || N0.getValueType().getSizeInBits() >= + (N0 == CTPOP || N0.getValueType().getSizeInBits() > Log2_32_Ceil(CTPOP.getValueType().getSizeInBits()))) { EVT CTVT = CTPOP.getValueType(); SDValue CTOp = CTPOP.getOperand(0); diff --git a/llvm/test/CodeGen/X86/ctpop-combine.ll b/llvm/test/CodeGen/X86/ctpop-combine.ll index b87637f9424..c957d385a24 100644 --- a/llvm/test/CodeGen/X86/ctpop-combine.ll +++ b/llvm/test/CodeGen/X86/ctpop-combine.ll @@ -18,8 +18,7 @@ define i32 @test1(i64 %x) nounwind readnone { define i32 @test2(i64 %x) nounwind readnone { %count = tail call i64 @llvm.ctpop.i64(i64 %x) - %cast = trunc i64 %count to i32 - %cmp = icmp ult i32 %cast, 2 + %cmp = icmp ult i64 %count, 2 %conv = zext i1 %cmp to i32 ret i32 %conv ; CHECK: test2: @@ -29,3 +28,13 @@ define i32 @test2(i64 %x) nounwind readnone { ; CHECK: ret } +define i32 @test3(i64 %x) nounwind readnone { + %count = tail call i64 @llvm.ctpop.i64(i64 %x) + %cast = trunc i64 %count to i6 ; Too small for 0-64 + %cmp = icmp ult i6 %cast, 2 + %conv = zext i1 %cmp to i32 + ret i32 %conv +; CHECK: test3: +; CHECK: cmpb $2 +; CHECK: ret +} |
