Fixups

Author: MacDue

llvm/include/llvm/CodeGen/BasicTTIImpl.h

@@ -294,7 +294,7 @@ class BasicTTIImplBase : public TargetTransformInfoImplCRTPBase<T> {
   /// the cost, which includes the cost of the mask (if required), and the loads
   /// for values returned via output pointers. \p LC is the scalar libcall and
   /// \p CallRetElementIndex (optional) is the struct element which is mapped to
-  /// the call return value. If std::nullopt is returned, the no vector library
+  /// the call return value. If std::nullopt is returned, then no vector library
   /// call is available, so the intrinsic should be assigned the default cost
   /// (e.g. scalarization).
   std::optional<InstructionCost> getMultipleResultIntrinsicVectorLibCallCost(

llvm/lib/Analysis/CostModel.cpp

@@ -44,9 +44,9 @@ static cl::opt<bool> TypeBasedIntrinsicCost("type-based-intrinsic-cost",
     cl::desc("Calculate intrinsics cost based only on argument types"),
     cl::init(false));
 
-static cl::opt<bool> LibCallBasedIntrinsicCost(
-    "libcall-based-intrinsic-cost",
-    cl::desc("Calculate intrinsics cost using target library info"),
+static cl::opt<bool> PreferIntrinsicCost(
+    "prefer-intrinsic-cost",
+    cl::desc("Prefer using getIntrinsicInstrCost over getInstructionCost"),
     cl::init(false));
 
 #define CM_NAME "cost-model"
@@ -63,7 +63,7 @@ PreservedAnalyses CostModelPrinterPass::run(Function &F,
       // which cost kind to print.
       InstructionCost Cost;
       auto *II = dyn_cast<IntrinsicInst>(&Inst);
-      if (II && (LibCallBasedIntrinsicCost || TypeBasedIntrinsicCost)) {
+      if (II && (PreferIntrinsicCost || TypeBasedIntrinsicCost)) {
         IntrinsicCostAttributes ICA(
             II->getIntrinsicID(), *II, InstructionCost::getInvalid(),
             /*TypeBasedOnly=*/TypeBasedIntrinsicCost, &TLI);

llvm/test/Analysis/CostModel/AArch64/sincos.ll

@@ -1,6 +1,6 @@
 ; NOTE: Assertions have been autogenerated by utils/update_analyze_test_checks.py UTC_ARGS: --filter "sincos"
 ; RUN: opt < %s -mtriple=aarch64-gnu-linux -mattr=+neon,+sve -passes="print<cost-model>" -cost-kind=throughput 2>&1 -disable-output | FileCheck %s
-; RUN: opt < %s -mtriple=aarch64-gnu-linux -mattr=+neon,+sve -vector-library=ArmPL -passes="print<cost-model>" -libcall-based-intrinsic-cost -cost-kind=throughput 2>&1 -disable-output | FileCheck %s -check-prefix=CHECK-VECLIB
+; RUN: opt < %s -mtriple=aarch64-gnu-linux -mattr=+neon,+sve -vector-library=ArmPL -passes="print<cost-model>" -prefer-intrinsic-cost -cost-kind=throughput 2>&1 -disable-output | FileCheck %s -check-prefix=CHECK-VECLIB
 
 define void @sincos() {
 ; CHECK-LABEL: 'sincos'