Revert "[X86] combineAndNotOrIntoAndNotAnd - don't attempt with constant operands"

This reverts commit ec78f0d.

Author: Saldivarcher

llvm/lib/Target/X86/X86ISelLowering.cpp

@@ -50047,15 +50047,12 @@ static SDValue combineAndNotOrIntoAndNotAnd(SDNode *N, SelectionDAG &DAG) {
     return SDValue();
 
   SDValue X, Y, Z;
-  if (sd_match(N, m_And(m_Value(X),
-                        m_OneUse(m_Or(m_Value(Y), m_Not(m_Value(Z))))))) {
-    // Don't fold if Y is a constant to prevent infinite loops.
-    if (!isa<ConstantSDNode>(Y))
-      return DAG.getNode(
-          ISD::AND, DL, VT, X,
-          DAG.getNOT(
-              DL, DAG.getNode(ISD::AND, DL, VT, DAG.getNOT(DL, Y, VT), Z), VT));
-  }
+  if (sd_match(
+          N, m_And(m_Value(X), m_OneUse(m_Or(m_Value(Y), m_Not(m_Value(Z)))))))
+    return DAG.getNode(
+        ISD::AND, DL, VT, X,
+        DAG.getNOT(DL, DAG.getNode(ISD::AND, DL, VT, DAG.getNOT(DL, Y, VT), Z),
+                   VT));
 
   return SDValue();
 }

llvm/test/CodeGen/X86/pr108731.ll

@@ -141,54 +141,5 @@ Entry:
   ret <16 x i8> %and3
 }
 
-define <32 x i8> @test_v32i8(<32 x i8> %w, <32 x i8> %x, <32 x i8> %y, <32 x i8> %z) {
-; NOBMI-LABEL: test_v32i8:
-; NOBMI:       # %bb.0: # %Entry
-; NOBMI-NEXT:    andps %xmm4, %xmm2
-; NOBMI-NEXT:    andps %xmm5, %xmm3
-; NOBMI-NEXT:    andnps %xmm1, %xmm3
-; NOBMI-NEXT:    andnps %xmm0, %xmm2
-; NOBMI-NEXT:    andnps %xmm6, %xmm4
-; NOBMI-NEXT:    andnps %xmm2, %xmm4
-; NOBMI-NEXT:    andnps %xmm7, %xmm5
-; NOBMI-NEXT:    andnps %xmm3, %xmm5
-; NOBMI-NEXT:    movaps %xmm4, %xmm0
-; NOBMI-NEXT:    movaps %xmm5, %xmm1
-; NOBMI-NEXT:    retq
-;
-; BMI-LABEL: test_v32i8:
-; BMI:       # %bb.0: # %Entry
-; BMI-NEXT:    vandps %ymm1, %ymm2, %ymm1
-; BMI-NEXT:    vandnps %ymm0, %ymm1, %ymm0
-; BMI-NEXT:    vandnps %ymm3, %ymm2, %ymm1
-; BMI-NEXT:    vandnps %ymm0, %ymm1, %ymm0
-; BMI-NEXT:    retq
-Entry:
-  %and1 = and <32 x i8> %y, %x
-  %xor1 = xor <32 x i8> %and1, <i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1>
-  %and2 = and <32 x i8> %xor1, %w
-  %.not = xor <32 x i8> %z, <i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1, i8 -1>
-  %or1 = or <32 x i8> %.not, %y
-  %and3 = and <32 x i8> %and2, %or1
-  ret <32 x i8> %and3
-}
-
-; PR112347 - don't fold if we'd be inverting a constant, as demorgan normalisation will invert it back again.
-define void @PR112347(ptr %p0, ptr %p1, ptr %p2) {
-; CHECK-LABEL: PR112347:
-; CHECK:       # %bb.0:
-; CHECK-NEXT:    movl (%rdi), %eax
-; CHECK-NEXT:    notl %eax
-; CHECK-NEXT:    orl $-16777204, %eax # imm = 0xFF00000C
-; CHECK-NEXT:    andl (%rsi), %eax
-; CHECK-NEXT:    movl %eax, (%rdx)
-; CHECK-NEXT:    retq
-  %load0 = load i32, ptr %p0, align 1
-  %load1 = load i32, ptr %p1, align 4
-  %not = xor i32 %load0, -1
-  %top = or i32 %not, -16777204
-  %mask = and i32 %load1, %top
-  store i32 %mask, ptr %p2, align 4
-  ret void
-}
-
+;; NOTE: These prefixes are unused and the list is autogenerated. Do not add tests below this line:
+; CHECK: {{.*}}