Address review comment

Author: david-arm

llvm/include/llvm/CodeGen/BasicTTIImpl.h

@@ -1691,29 +1691,6 @@ class BasicTTIImplBase : public TargetTransformInfoImplCRTPBase<T> {
     return Cost;
   }
 
-  InstructionCost getActiveLaneMaskCost(Type *RetTy, Type *ArgTy,
-                                        TTI::TargetCostKind CostKind) {
-    EVT ResVT = getTLI()->getValueType(DL, RetTy, true);
-    EVT ArgVT = getTLI()->getValueType(DL, ArgTy, true);
-
-    // If we're not expanding the intrinsic then we assume this is cheap
-    // to implement.
-    if (!getTLI()->shouldExpandGetActiveLaneMask(ResVT, ArgVT))
-      return getTypeLegalizationCost(RetTy).first;
-
-    // Create the expanded types that will be used to calculate the uadd_sat
-    // operation.
-    Type *ExpRetTy =
-        VectorType::get(ArgTy, cast<VectorType>(RetTy)->getElementCount());
-    IntrinsicCostAttributes Attrs(Intrinsic::uadd_sat, ExpRetTy, {},
-                                  FastMathFlags());
-    InstructionCost Cost =
-        thisT()->getTypeBasedIntrinsicInstrCost(Attrs, CostKind);
-    Cost += thisT()->getCmpSelInstrCost(BinaryOperator::ICmp, ExpRetTy, RetTy,
-                                        CmpInst::ICMP_ULT, CostKind);
-    return Cost;
-  }
-
   /// Get intrinsic cost based on arguments.
   InstructionCost getIntrinsicInstrCost(const IntrinsicCostAttributes &ICA,
                                         TTI::TargetCostKind CostKind) {
@@ -2009,10 +1986,6 @@ class BasicTTIImplBase : public TargetTransformInfoImplCRTPBase<T> {
       }
       return Cost;
     }
-    case Intrinsic::get_active_lane_mask: {
-      return thisT()->getActiveLaneMaskCost(RetTy, ICA.getArgTypes()[0],
-                                            CostKind);
-    }
     case Intrinsic::experimental_cttz_elts: {
       EVT ArgType = getTLI()->getValueType(DL, ICA.getArgTypes()[0], true);
 
@@ -2060,6 +2033,7 @@ class BasicTTIImplBase : public TargetTransformInfoImplCRTPBase<T> {
 
       return Cost;
     }
+    case Intrinsic::get_active_lane_mask:
     case Intrinsic::experimental_vector_match:
       return thisT()->getTypeBasedIntrinsicInstrCost(ICA, CostKind);
     case Intrinsic::modf:
@@ -2400,9 +2374,28 @@ class BasicTTIImplBase : public TargetTransformInfoImplCRTPBase<T> {
           thisT()->getArithmeticInstrCost(BinaryOperator::And, RetTy, CostKind);
       return Cost;
     }
-    case Intrinsic::get_active_lane_mask:
-      return thisT()->getActiveLaneMaskCost(RetTy, ICA.getArgTypes()[0],
-                                            CostKind);
+    case Intrinsic::get_active_lane_mask: {
+      Type *ArgTy = ICA.getArgTypes()[0];
+      EVT ResVT = getTLI()->getValueType(DL, RetTy, true);
+      EVT ArgVT = getTLI()->getValueType(DL, ArgTy, true);
+
+      // If we're not expanding the intrinsic then we assume this is cheap
+      // to implement.
+      if (!getTLI()->shouldExpandGetActiveLaneMask(ResVT, ArgVT))
+        return getTypeLegalizationCost(RetTy).first;
+
+      // Create the expanded types that will be used to calculate the uadd_sat
+      // operation.
+      Type *ExpRetTy =
+          VectorType::get(ArgTy, cast<VectorType>(RetTy)->getElementCount());
+      IntrinsicCostAttributes Attrs(Intrinsic::uadd_sat, ExpRetTy, {},
+                                    FastMathFlags());
+      InstructionCost Cost =
+          thisT()->getTypeBasedIntrinsicInstrCost(Attrs, CostKind);
+      Cost += thisT()->getCmpSelInstrCost(BinaryOperator::ICmp, ExpRetTy, RetTy,
+                                          CmpInst::ICMP_ULT, CostKind);
+      return Cost;
+    }
     case Intrinsic::abs:
       ISD = ISD::ABS;
       break;