diff options
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp | 22 | ||||
| -rw-r--r-- | llvm/test/CodeGen/X86/ctpop-combine.ll | 27 |
2 files changed, 17 insertions, 32 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp index d83bd108b67..74ab96afe5a 100644 --- a/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/TargetLowering.cpp @@ -2715,19 +2715,19 @@ SDValue TargetLowering::SimplifySetCC(EVT VT, SDValue N0, SDValue N1, } // If ctpop is not supported, expand a power-of-2 comparison based on it. - if (C1 == 1 && !isOperationLegalOrCustom(ISD::CTPOP, CTVT)) { + if (C1 == 1 && !isOperationLegalOrCustom(ISD::CTPOP, CTVT) && + (Cond == ISD::SETEQ || Cond == ISD::SETNE)) { // (ctpop x) == 1 --> (x != 0) && ((x & x-1) == 0) - if (Cond == ISD::SETEQ) { - SDValue Zero = DAG.getConstant(0, dl, CTVT); - SDValue NegOne = DAG.getAllOnesConstant(dl, CTVT); - SDValue Add = DAG.getNode(ISD::ADD, dl, CTVT, CTOp, NegOne); - SDValue And = DAG.getNode(ISD::AND, dl, CTVT, CTOp, Add); - SDValue LHS = DAG.getSetCC(dl, VT, CTOp, Zero, ISD::SETNE); - SDValue RHS = DAG.getSetCC(dl, VT, And, Zero, ISD::SETEQ); - return DAG.getNode(ISD::AND, dl, VT, LHS, RHS); - } - // TODO: // (ctpop x) != 1 --> (x == 0) || ((x & x-1) != 0) + SDValue Zero = DAG.getConstant(0, dl, CTVT); + SDValue NegOne = DAG.getAllOnesConstant(dl, CTVT); + ISD::CondCode InvCond = ISD::getSetCCInverse(Cond, true); + SDValue Add = DAG.getNode(ISD::ADD, dl, CTVT, CTOp, NegOne); + SDValue And = DAG.getNode(ISD::AND, dl, CTVT, CTOp, Add); + SDValue LHS = DAG.getSetCC(dl, VT, CTOp, Zero, InvCond); + SDValue RHS = DAG.getSetCC(dl, VT, And, Zero, Cond); + unsigned LogicOpcode = Cond == ISD::SETEQ ? ISD::AND : ISD::OR; + return DAG.getNode(LogicOpcode, dl, VT, LHS, RHS); } } diff --git a/llvm/test/CodeGen/X86/ctpop-combine.ll b/llvm/test/CodeGen/X86/ctpop-combine.ll index f351637c113..cdef5771f2c 100644 --- a/llvm/test/CodeGen/X86/ctpop-combine.ll +++ b/llvm/test/CodeGen/X86/ctpop-combine.ll @@ -147,28 +147,13 @@ define i32 @ctpop_ne_one(i64 %x) nounwind readnone { ; ; NO-POPCOUNT-LABEL: ctpop_ne_one: ; NO-POPCOUNT: # %bb.0: -; NO-POPCOUNT-NEXT: movq %rdi, %rax -; NO-POPCOUNT-NEXT: shrq %rax -; NO-POPCOUNT-NEXT: movabsq $6148914691236517205, %rcx # imm = 0x5555555555555555 -; NO-POPCOUNT-NEXT: andq %rax, %rcx -; NO-POPCOUNT-NEXT: subq %rcx, %rdi -; NO-POPCOUNT-NEXT: movabsq $3689348814741910323, %rax # imm = 0x3333333333333333 -; NO-POPCOUNT-NEXT: movq %rdi, %rcx -; NO-POPCOUNT-NEXT: andq %rax, %rcx -; NO-POPCOUNT-NEXT: shrq $2, %rdi -; NO-POPCOUNT-NEXT: andq %rax, %rdi -; NO-POPCOUNT-NEXT: addq %rcx, %rdi -; NO-POPCOUNT-NEXT: movq %rdi, %rax -; NO-POPCOUNT-NEXT: shrq $4, %rax -; NO-POPCOUNT-NEXT: addq %rdi, %rax -; NO-POPCOUNT-NEXT: movabsq $1085102592571150095, %rcx # imm = 0xF0F0F0F0F0F0F0F -; NO-POPCOUNT-NEXT: andq %rax, %rcx -; NO-POPCOUNT-NEXT: movabsq $72340172838076673, %rdx # imm = 0x101010101010101 -; NO-POPCOUNT-NEXT: imulq %rcx, %rdx -; NO-POPCOUNT-NEXT: shrq $56, %rdx -; NO-POPCOUNT-NEXT: xorl %eax, %eax -; NO-POPCOUNT-NEXT: cmpq $1, %rdx +; NO-POPCOUNT-NEXT: leaq -1(%rdi), %rax +; NO-POPCOUNT-NEXT: testq %rax, %rdi ; NO-POPCOUNT-NEXT: setne %al +; NO-POPCOUNT-NEXT: testq %rdi, %rdi +; NO-POPCOUNT-NEXT: sete %cl +; NO-POPCOUNT-NEXT: orb %al, %cl +; NO-POPCOUNT-NEXT: movzbl %cl, %eax ; NO-POPCOUNT-NEXT: retq %count = tail call i64 @llvm.ctpop.i64(i64 %x) %cmp = icmp ne i64 %count, 1 |
