Rollback hasFP16

Author: Him188

llvm/lib/Target/AArch64/GISel/AArch64LegalizerInfo.cpp

@@ -89,13 +89,6 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST)
   const bool HasFP16 = ST.hasFullFP16();
   const LLT &MinFPScalar = HasFP16 ? s16 : s32;
 
-  // A legality predicate that returns true if the subtarget has FP16 support.
-  // To be used in combination with other predicates, e.g:
-  //     .legalIf(all(hasFP16(), typeInSet(0, {v8s16, v4s16})))
-  const auto hasFP16 = [=]() -> LegalityPredicate {
-    return [=](const LegalityQuery &) { return HasFP16; };
-  };
-
   const bool HasCSSC = ST.hasCSSC();
   const bool HasRCPC3 = ST.hasRCPC3();
 
@@ -267,10 +260,10 @@ AArch64LegalizerInfo::AArch64LegalizerInfo(const AArch64Subtarget &ST)
 
   getActionDefinitionsBuilder(G_FABS)
       .legalFor({MinFPScalar, s32, s64, v2s32, v4s32, v2s64})
-      .legalIf(all(hasFP16(), typeInSet(0, {v8s16, v4s16})))
-      // TODO: Lower supports 128-bit types but G_AND generated by Lower does
-      // not yet.
-      //       When it does, we can remove scalarizeIf.
+      .legalIf([=](const LegalityQuery &Query) {
+        const auto &Ty = Query.Types[0];
+        return (Ty == v8s16 || Ty == v4s16) && HasFP16;
+      })
       .scalarizeIf(scalarOrEltWiderThan(0, 64), 0)
       .lowerIf(scalarOrEltWiderThan(0, 64))
       .minScalarOrElt(0, MinFPScalar)