[llvm] r294588 - [X86][btver2] PR31902: Fix a crash in combineOrCmpEqZeroToCtlzSrl under fast math.
Pierre Gousseau via llvm-commits
llvm-commits at lists.llvm.org
Thu Feb 9 06:43:59 PST 2017
Author: pgousseau
Date: Thu Feb 9 08:43:58 2017
New Revision: 294588
URL: http://llvm.org/viewvc/llvm-project?rev=294588&view=rev
Log:
[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
Modified:
llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
llvm/trunk/test/CodeGen/X86/lzcnt-zext-cmp.ll
Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=294588&r1=294587&r2=294588&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Thu Feb 9 08:43:58 2017
@@ -31166,7 +31166,7 @@ static SDValue combineOrCmpEqZeroToCtlzS
return N->getOpcode() == X86ISD::SETCC && N->hasOneUse() &&
X86::CondCode(N->getConstantOperandVal(0)) == X86::COND_E &&
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);
};
Modified: llvm/trunk/test/CodeGen/X86/lzcnt-zext-cmp.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/lzcnt-zext-cmp.ll?rev=294588&r1=294587&r2=294588&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/lzcnt-zext-cmp.ll (original)
+++ llvm/trunk/test/CodeGen/X86/lzcnt-zext-cmp.ll Thu Feb 9 08:43:58 2017
@@ -341,3 +341,34 @@ entry:
%lor.ext = zext i1 %0 to i32
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
+}
More information about the llvm-commits
mailing list