Revert "[InstCombine] canonicalize zext-and-of-bool compare to narrow and"

This reverts commit b5a9361.

Author: cyyself

llvm/lib/Transforms/InstCombine/InstCombineCompares.cpp

@@ -1947,20 +1947,6 @@ Instruction *InstCombinerImpl::foldICmpAndConstant(ICmpInst &Cmp,
     }
   }
 
-  // ((zext i1 X) & Y) == 0 --> !((trunc Y) & X)
-  // ((zext i1 X) & Y) != 0 -->  ((trunc Y) & X)
-  // ((zext i1 X) & Y) == 1 -->  ((trunc Y) & X)
-  // ((zext i1 X) & Y) != 1 --> !((trunc Y) & X)
-  if (match(And, m_OneUse(m_c_And(m_OneUse(m_ZExt(m_Value(X))), m_Value(Y)))) &&
-      X->getType()->isIntOrIntVectorTy(1) && (C.isZero() || C.isOne())) {
-    Value *TruncY = Builder.CreateTrunc(Y, X->getType());
-    if (C.isZero() ^ (Pred == CmpInst::ICMP_NE)) {
-      Value *And = Builder.CreateAnd(TruncY, X);
-      return BinaryOperator::CreateNot(And);
-    }
-    return BinaryOperator::CreateAnd(TruncY, X);
-  }
-
   // (icmp eq/ne (and (shl -1, X), Y), 0)
   //    -> (icmp eq/ne (lshr Y, X), 0)
   // We could technically handle any C == 0 or (C < 0 && isOdd(C)) but it seems

llvm/test/Transforms/InstCombine/and-xor-or.ll

@@ -4342,7 +4342,11 @@ define i32 @or_sext_sext_use1(i8 %x, i4 %y) {
 define i1 @PR56294(i8 %x) {
 ; CHECK-LABEL: define {{[^@]+}}@PR56294
 ; CHECK-SAME: (i8 [[X:%.*]]) {
-; CHECK-NEXT:    ret i1 false
+; CHECK-NEXT:    [[T2:%.*]] = icmp eq i8 [[X]], 2
+; CHECK-NEXT:    [[TMP1:%.*]] = zext i1 [[T2]] to i8
+; CHECK-NEXT:    [[TMP2:%.*]] = and i8 [[TMP1]], [[X]]
+; CHECK-NEXT:    [[T7:%.*]] = icmp ne i8 [[TMP2]], 0
+; CHECK-NEXT:    ret i1 [[T7]]
 ;
   %t2 = icmp eq i8 %x, 2
   %t3 = and i8 %x, 1

llvm/test/Transforms/InstCombine/icmp.ll

@@ -4584,10 +4584,9 @@ define i1 @redundant_sign_bit_count_ugt_31_30(i32 %x) {
 
 define i1 @zext_bool_and_eq0(i1 %x, i8 %y) {
 ; CHECK-LABEL: @zext_bool_and_eq0(
-; CHECK-NEXT:    [[TMP1:%.*]] = and i8 [[Y:%.*]], 1
-; CHECK-NEXT:    [[TMP2:%.*]] = icmp ne i8 [[TMP1]], 0
-; CHECK-NEXT:    [[TMP3:%.*]] = and i1 [[TMP2]], [[X:%.*]]
-; CHECK-NEXT:    [[R:%.*]] = xor i1 [[TMP3]], true
+; CHECK-NEXT:    [[ZX:%.*]] = zext i1 [[X:%.*]] to i8
+; CHECK-NEXT:    [[A:%.*]] = and i8 [[ZX]], [[Y:%.*]]
+; CHECK-NEXT:    [[R:%.*]] = icmp eq i8 [[A]], 0
 ; CHECK-NEXT:    ret i1 [[R]]
 ;
   %zx = zext i1 %x to i8
@@ -4598,9 +4597,9 @@ define i1 @zext_bool_and_eq0(i1 %x, i8 %y) {
 
 define <2 x i1> @zext_bool_and_eq0_commute(<2 x i1> %x, <2 x i8> %p) {
 ; CHECK-LABEL: @zext_bool_and_eq0_commute(
-; CHECK-NEXT:    [[TMP1:%.*]] = trunc <2 x i8> [[P:%.*]] to <2 x i1>
-; CHECK-NEXT:    [[TMP2:%.*]] = and <2 x i1> [[TMP1]], [[X:%.*]]
-; CHECK-NEXT:    [[R:%.*]] = xor <2 x i1> [[TMP2]], <i1 true, i1 true>
+; CHECK-NEXT:    [[ZX:%.*]] = zext <2 x i1> [[X:%.*]] to <2 x i8>
+; CHECK-NEXT:    [[A:%.*]] = and <2 x i8> [[ZX]], [[P:%.*]]
+; CHECK-NEXT:    [[R:%.*]] = icmp eq <2 x i8> [[A]], zeroinitializer
 ; CHECK-NEXT:    ret <2 x i1> [[R]]
 ;
   %y = mul <2 x i8> %p, %p ; thwart complexity-based canonicalization
@@ -4612,9 +4611,9 @@ define <2 x i1> @zext_bool_and_eq0_commute(<2 x i1> %x, <2 x i8> %p) {
 
 define i1 @zext_bool_and_ne0(i1 %x, i8 %y) {
 ; CHECK-LABEL: @zext_bool_and_ne0(
-; CHECK-NEXT:    [[TMP1:%.*]] = and i8 [[Y:%.*]], 1
-; CHECK-NEXT:    [[TMP2:%.*]] = icmp ne i8 [[TMP1]], 0
-; CHECK-NEXT:    [[R:%.*]] = and i1 [[TMP2]], [[X:%.*]]
+; CHECK-NEXT:    [[ZX:%.*]] = zext i1 [[X:%.*]] to i8
+; CHECK-NEXT:    [[A:%.*]] = and i8 [[ZX]], [[Y:%.*]]
+; CHECK-NEXT:    [[R:%.*]] = icmp ne i8 [[A]], 0
 ; CHECK-NEXT:    ret i1 [[R]]
 ;
   %zx = zext i1 %x to i8
@@ -4664,8 +4663,6 @@ define i1 @zext_bool_or_eq0(i1 %x, i8 %y) {
   ret i1 %r
 }
 
-; negative test - extra use
-
 define i1 @zext_bool_and_eq0_use(i1 %x, i64 %y) {
 ; CHECK-LABEL: @zext_bool_and_eq0_use(
 ; CHECK-NEXT:    [[ZX:%.*]] = zext i1 [[X:%.*]] to i64
@@ -4681,8 +4678,6 @@ define i1 @zext_bool_and_eq0_use(i1 %x, i64 %y) {
   ret i1 %r
 }
 
-; negative test - extra use
-
 define i1 @zext_bool_and_ne0_use(i1 %x, i64 %y) {
 ; CHECK-LABEL: @zext_bool_and_ne0_use(
 ; CHECK-NEXT:    [[ZX:%.*]] = zext i1 [[X:%.*]] to i64
@@ -4698,8 +4693,6 @@ define i1 @zext_bool_and_ne0_use(i1 %x, i64 %y) {
   ret i1 %r
 }
 
-; negative test - must zext from i1
-
 define i1 @zext_notbool_and_ne0(i2 %x, i8 %y) {
 ; CHECK-LABEL: @zext_notbool_and_ne0(
 ; CHECK-NEXT:    [[ZX:%.*]] = zext i2 [[X:%.*]] to i8