[InstSimplify] allow icmp with constant folds for splat vectors, part 1

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@279538 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Analysis/InstructionSimplify.cpp b/lib/Analysis/InstructionSimplify.cpp
index 5b78058..c048f31 100644 (file)
--- a/lib/Analysis/InstructionSimplify.cpp
+++ b/lib/Analysis/InstructionSimplify.cpp
@@ -2154,17 +2154,21 @@ computePointerICmp(const DataLayout &DL, const TargetLibraryInfo *TLI,
 
 static Value *simplifyICmpWithConstant(CmpInst::Predicate Pred, Value *LHS,
                                        Value *RHS) {
-  // FIXME: Use m_APInt here and below to allow splat vector folds.
-  ConstantInt *CI = dyn_cast<ConstantInt>(RHS);
-  if (!CI)
+  const APInt *C;
+  if (!match(RHS, m_APInt(C)))
     return nullptr;
 
   // Rule out tautological comparisons (eg., ult 0 or uge 0).
-  ConstantRange RHS_CR = ICmpInst::makeConstantRange(Pred, CI->getValue());
+  ConstantRange RHS_CR = ICmpInst::makeConstantRange(Pred, *C);
   if (RHS_CR.isEmptySet())
-    return ConstantInt::getFalse(CI->getContext());
+    return ConstantInt::getFalse(GetCompareTy(RHS));
   if (RHS_CR.isFullSet())
-    return ConstantInt::getTrue(CI->getContext());
+    return ConstantInt::getTrue(GetCompareTy(RHS));
+
+  // FIXME: Use m_APInt below here to allow splat vector folds.
+  ConstantInt *CI = dyn_cast<ConstantInt>(RHS);
+  if (!CI)
+    return nullptr;
 
   // Many binary operators with constant RHS have easy to compute constant
   // range.  Use them to check whether the comparison is a tautology.

diff --git a/test/Transforms/InstSimplify/icmp-constant.ll b/test/Transforms/InstSimplify/icmp-constant.ll
index 084cc9e..3584aa6 100644 (file)
--- a/test/Transforms/InstSimplify/icmp-constant.ll
+++ b/test/Transforms/InstSimplify/icmp-constant.ll
@@ -13,8 +13,7 @@ define i1 @tautological_ule(i8 %x) {
 
 define <2 x i1> @tautological_ule_vec(<2 x i8> %x) {
 ; CHECK-LABEL: @tautological_ule_vec(
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ule <2 x i8> %x, <i8 -1, i8 -1>
-; CHECK-NEXT:    ret <2 x i1> [[CMP]]
+; CHECK-NEXT:    ret <2 x i1> <i1 true, i1 true>
 ;
   %cmp = icmp ule <2 x i8> %x, <i8 255, i8 255>
   ret <2 x i1> %cmp
@@ -30,8 +29,7 @@ define i1 @tautological_ugt(i8 %x) {
 
 define <2 x i1> @tautological_ugt_vec(<2 x i8> %x) {
 ; CHECK-LABEL: @tautological_ugt_vec(
-; CHECK-NEXT:    [[CMP:%.*]] = icmp ugt <2 x i8> %x, <i8 -1, i8 -1>
-; CHECK-NEXT:    ret <2 x i1> [[CMP]]
+; CHECK-NEXT:    ret <2 x i1> zeroinitializer
 ;
   %cmp = icmp ugt <2 x i8> %x, <i8 255, i8 255>
   ret <2 x i1> %cmp