maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[X86][btver2] PR31902: Fix a crash in combineOrCmpEqZeroToCtlzSrl under fast math. 

In combineOrCmpEqZeroToCtlzSrl, replace "getConstantOperand == 0" by "isNullConstant" to account for floating point constants.

Differential Revision: https://reviews.llvm.org/D29756

llvm-svn: 294588
This commit is contained in:
Pierre Gousseau 2017-02-09 14:43:58 +00:00
parent 05ac1f70be
commit 6953b32475
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
llvm/lib/Target/X86/X86ISelLowering.cpp
View File

@ -31166,7 +31166,7 @@ static SDValue combineOrCmpEqZeroToCtlzSrl(SDNode *N, SelectionDAG &DAG,
return N->getOpcode() == X86ISD::SETCC && N->hasOneUse() && return N->getOpcode() == X86ISD::SETCC && N->hasOneUse() &&
X86::CondCode(N->getConstantOperandVal(0)) == X86::COND_E && X86::CondCode(N->getConstantOperandVal(0)) == X86::COND_E &&
N->getOperand(1).getOpcode() == X86ISD::CMP && N->getOperand(1).getOpcode() == X86ISD::CMP &&
N->getOperand(1).getConstantOperandVal(1) == 0 && isNullConstant(N->getOperand(1).getOperand(1)) &&
N->getOperand(1).getValueType().bitsGE(MVT::i32); N->getOperand(1).getValueType().bitsGE(MVT::i32);
}; };

31
llvm/test/CodeGen/X86/lzcnt-zext-cmp.ll
View File

@ -341,3 +341,34 @@ entry:
%lor.ext = zext i1 %0 to i32 %lor.ext = zext i1 %0 to i32
ret i32 %lor.ext ret i32 %lor.ext
} }
; PR31902 Fix a crash in combineOrCmpEqZeroToCtlzSrl under fast math.
define i32 @test_zext_cmp11(double %a, double %b) "no-nans-fp-math"="true" {
; CHECK-LABEL: test_zext_cmp11:
; CHECK: # BB#0: # %entry
; CHECK-NEXT: vxorps %xmm2, %xmm2, %xmm2
; CHECK-NEXT: vucomisd %xmm2, %xmm0
; CHECK-NEXT: sete %al
; CHECK-NEXT: vucomisd %xmm2, %xmm1
; CHECK-NEXT: sete %cl
; CHECK-NEXT: orb %al, %cl
; CHECK-NEXT: movzbl %cl, %eax
; CHECK-NEXT: retq
;
; NOFASTLZCNT-LABEL: test_zext_cmp11:
; NOFASTLZCNT: # BB#0: # %entry
; NOFASTLZCNT-NEXT: vxorps %xmm2, %xmm2, %xmm2
; NOFASTLZCNT-NEXT: vucomisd %xmm2, %xmm0
; NOFASTLZCNT-NEXT: sete %al
; NOFASTLZCNT-NEXT: vucomisd %xmm2, %xmm1
; NOFASTLZCNT-NEXT: sete %cl
; NOFASTLZCNT-NEXT: orb %al, %cl
; NOFASTLZCNT-NEXT: movzbl %cl, %eax
; NOFASTLZCNT-NEXT: retq
entry:
%cmp = fcmp fast oeq double %a, 0.000000e+00
%cmp1 = fcmp fast oeq double %b, 0.000000e+00
%0 = or i1 %cmp, %cmp1
%conv = zext i1 %0 to i32
ret i32 %conv
}