Addressing reviewers (2)

Author: paschalis-mpeis

llvm/include/llvm/Analysis/TargetTransformInfo.h

@@ -1258,9 +1258,10 @@ class TargetTransformInfo {
   /// Returns the cost of a vector instruction based on the assumption that frem
   /// will be later transformed (by ReplaceWithVecLib) into a call to a
   /// platform specific frem vector math function.
-  /// If unsupported, it will return cost using getArithmeticInstrCost.
+  /// Returns the same cost as getArithmeticInstrCost when no math function is
+  /// available.
   InstructionCost getFRemInstrCost(
-      const TargetLibraryInfo *TLI, unsigned Opcode, Type *Ty,
+      const TargetLibraryInfo *TLI, Type *Ty,
       TTI::TargetCostKind CostKind = TTI::TCK_RecipThroughput,
       TTI::OperandValueInfo Opd1Info = {TTI::OK_AnyValue, TTI::OP_None},
       TTI::OperandValueInfo Opd2Info = {TTI::OK_AnyValue, TTI::OP_None},

llvm/lib/Analysis/TargetTransformInfo.cpp

@@ -885,21 +885,17 @@ InstructionCost TargetTransformInfo::getArithmeticInstrCost(
 }
 
 InstructionCost TargetTransformInfo::getFRemInstrCost(
-    const TargetLibraryInfo *TLI, unsigned Opcode, Type *Ty,
-    TTI::TargetCostKind CostKind, OperandValueInfo Op1Info,
-    OperandValueInfo Op2Info, ArrayRef<const Value *> Args,
-    const Instruction *CxtI) const {
-  assert(Opcode == Instruction::FRem && "Instruction must be frem");
-
+    const TargetLibraryInfo *TLI, Type *Ty, TTI::TargetCostKind CostKind,
+    OperandValueInfo Op1Info, OperandValueInfo Op2Info,
+    ArrayRef<const Value *> Args, const Instruction *CxtI) const {
   VectorType *VecTy = dyn_cast<VectorType>(Ty);
-  Type *ScalarTy = VecTy ? VecTy->getScalarType() : Ty;
   LibFunc Func;
-  if (VecTy && TLI->getLibFunc(Opcode, ScalarTy, Func) &&
+  if (VecTy && TLI->getLibFunc(Instruction::FRem, Ty->getScalarType(), Func) &&
       TLI->isFunctionVectorizable(TLI->getName(Func), VecTy->getElementCount()))
     return getCallInstrCost(nullptr, VecTy, {VecTy, VecTy}, CostKind);
 
-  return getArithmeticInstrCost(Opcode, Ty, CostKind, Op1Info, Op2Info, Args,
-                                CxtI);
+  return getArithmeticInstrCost(Instruction::FRem, Ty, CostKind, Op1Info,
+                                Op2Info, Args, CxtI);
 }
 
 InstructionCost TargetTransformInfo::getAltInstrCost(

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -6913,10 +6913,9 @@ LoopVectorizationCostModel::getInstructionCost(Instruction *I, ElementCount VF,
     SmallVector<const Value *, 4> Operands(I->operand_values());
     TTI::OperandValueInfo Op1Info{TargetTransformInfo::OK_AnyValue,
                                   TargetTransformInfo::OP_None};
-    // Some targets replace frem with vector library calls.
     if (I->getOpcode() == Instruction::FRem)
-      return TTI.getFRemInstrCost(TLI, I->getOpcode(), VectorTy, CostKind,
-                                  Op1Info, Op2Info, Operands, I);
+      return TTI.getFRemInstrCost(TLI, VectorTy, CostKind, Op1Info, Op2Info,
+                                  Operands, I);
 
     return TTI.getArithmeticInstrCost(I->getOpcode(), VectorTy, CostKind,
                                       Op1Info, Op2Info, Operands, I);

llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp

@@ -8851,11 +8851,8 @@ BoUpSLP::getEntryCost(const TreeEntry *E, ArrayRef<Value *> VectorizedVals,
       unsigned OpIdx = isa<UnaryOperator>(VL0) ? 0 : 1;
       TTI::OperandValueInfo Op1Info = getOperandInfo(E->getOperand(0));
       TTI::OperandValueInfo Op2Info = getOperandInfo(E->getOperand(OpIdx));
-
-      // Some targets replace frem with vector library calls.
       if (ShuffleOrOp == Instruction::FRem)
-        return TTI->getFRemInstrCost(TLI, ShuffleOrOp, VecTy, CostKind, Op1Info,
-                                     Op2Info) +
+        return TTI->getFRemInstrCost(TLI, VecTy, CostKind, Op1Info, Op2Info) +
                CommonCost;
 
       return TTI->getArithmeticInstrCost(ShuffleOrOp, VecTy, CostKind, Op1Info,