Reapply llvm#149461

Author: badumbatish

llvm/lib/Target/WebAssembly/WebAssemblyISelLowering.cpp

@@ -3429,7 +3429,7 @@ combineVectorSizedSetCCEquality(SDNode *N, TargetLowering::DAGCombinerInfo &DCI,
                                    DL, MVT::i32),
                    Cmp});
 
-  return DAG.getSetCC(DL, VT, Intr, DAG.getConstant(0, DL, MVT::i32), CC);
+  return DAG.getSetCC(DL, VT, Intr, DAG.getConstant(0, DL, MVT::i32), ISD::SETNE);
 }
 
 static SDValue performSETCCCombine(SDNode *N,

llvm/test/CodeGen/WebAssembly/memcmp-expand.ll

@@ -135,8 +135,7 @@ define i1 @memcmp_expand_16(ptr %a, ptr %b) {
 ; CHECK-NEXT:    v128.load $push0=, 0($1):p2align=0
 ; CHECK-NEXT:    i8x16.eq $push2=, $pop1, $pop0
 ; CHECK-NEXT:    i8x16.all_true $push3=, $pop2
-; CHECK-NEXT:    i32.eqz $push4=, $pop3
-; CHECK-NEXT:    return $pop4
+; CHECK-NEXT:    return $pop3
   %cmp_16 = call i32 @memcmp(ptr %a, ptr %b, i32 16)
   %res = icmp eq i32 %cmp_16, 0
   ret i1 %res

llvm/test/CodeGen/WebAssembly/simd-setcc.ll

@@ -13,8 +13,7 @@ define i1 @setcc_load(ptr %a, ptr %b) {
 ; CHECK-NEXT:    v128.load $push0=, 0($1):p2align=0
 ; CHECK-NEXT:    i8x16.eq $push2=, $pop1, $pop0
 ; CHECK-NEXT:    i8x16.all_true $push3=, $pop2
-; CHECK-NEXT:    i32.eqz $push4=, $pop3
-; CHECK-NEXT:    return $pop4
+; CHECK-NEXT:    return $pop3
   %cmp_16 = call i32 @memcmp(ptr %a, ptr %b, i32 16)
   %res = icmp eq i32 %cmp_16, 0
   ret i1 %res
@@ -47,8 +46,7 @@ define i1 @setcc_eq_const_i128(ptr %ptr) {
 ; CHECK-NEXT:    v128.const $push1=, 6, 0
 ; CHECK-NEXT:    i8x16.eq $push2=, $pop0, $pop1
 ; CHECK-NEXT:    i8x16.all_true $push3=, $pop2
-; CHECK-NEXT:    i32.eqz $push4=, $pop3
-; CHECK-NEXT:    return $pop4
+; CHECK-NEXT:    return $pop3
   %l = load i128, ptr %ptr
   %res = icmp eq i128 %l, 6
   ret i1 %res