getLibFunc accepts an Opcode and a ScalarFTy.

Author: paschalis-mpeis

llvm/include/llvm/Analysis/TargetLibraryInfo.h

@@ -156,9 +156,9 @@ class TargetLibraryInfoImpl {
   /// FDecl is assumed to have a parent Module when using this function.
   bool getLibFunc(const Function &FDecl, LibFunc &F) const;
 
-  /// Searches for a function name using the opcode of \p I. Currently, only the
-  /// frem instruction is supported.
-  bool getLibFunc(const Instruction &I, LibFunc &F) const;
+  /// Searches for a function name using an Instruction \p Opcode.
+  /// Currently, only the frem instruction is supported.
+  bool getLibFunc(unsigned int Opcode, Type *ScalarTy, LibFunc &F) const;
 
   /// Forces a function to be marked as unavailable.
   void setUnavailable(LibFunc F) {
@@ -364,10 +364,10 @@ class TargetLibraryInfo {
            getLibFunc(*(CB.getCalledFunction()), F);
   }
 
-  /// Searches for a function name using the opcode of \p I. Currently, only the
-  /// frem instruction is supported.
-  bool getLibFunc(const Instruction &I, LibFunc &F) const {
-    return Impl->getLibFunc(I, F);
+  /// Searches for a function name using an Instruction \p Opcode.
+  /// Currently, only the frem instruction is supported.
+  bool getLibFunc(unsigned int Opcode, Type *ScalarTy, LibFunc &F) const {
+    return Impl->getLibFunc(Opcode, ScalarTy, F);
   }
 
   /// Disables all builtins.

llvm/lib/Analysis/TargetLibraryInfo.cpp

@@ -1149,12 +1149,11 @@ bool TargetLibraryInfoImpl::getLibFunc(const Function &FDecl,
   return isValidProtoForLibFunc(*FDecl.getFunctionType(), F, *M);
 }
 
-bool TargetLibraryInfoImpl::getLibFunc(const Instruction &I, LibFunc &F) const {
-  if (I.getOpcode() != Instruction::FRem)
-    return false;
-
-  Type *ScalarTy = I.getType()->getScalarType();
-  if (!ScalarTy->isDoubleTy() && !ScalarTy->isFloatTy())
+bool TargetLibraryInfoImpl::getLibFunc(unsigned int Opcode, Type *ScalarTy,
+                                       LibFunc &F) const {
+  // Must be a double or a float frem instruction.
+  if (Opcode != Instruction::FRem ||
+      (!ScalarTy->isDoubleTy() && !ScalarTy->isFloatTy()))
     return false;
 
   F = ScalarTy->isDoubleTy() ? LibFunc_fmod : LibFunc_fmodf;

llvm/unittests/Analysis/TargetLibraryInfoTest.cpp

@@ -639,8 +639,6 @@ class TLITestAarch64 : public ::testing::Test {
   TLITestAarch64() : TargetTriple(Triple("aarch64-unknown-linux-gnu")) {
     TLII = std::make_unique<TargetLibraryInfoImpl>(
         TargetLibraryInfoImpl(TargetTriple));
-    TLII->addVectorizableFunctionsFromVecLib(TargetLibraryInfoImpl::NoLibrary,
-                                             TargetTriple);
     TLI = std::make_unique<TargetLibraryInfo>(TargetLibraryInfo(*TLII));
   }
 
@@ -650,7 +648,7 @@ class TLITestAarch64 : public ::testing::Test {
     Value *V = Constant::getNullValue(Ty);
     Instruction *FRem = BinaryOperator::Create(Instruction::FRem, V, V);
     LibFunc Func;
-    if (!TLI->getLibFunc(*FRem, Func))
+    if (!TLI->getLibFunc(FRem->getOpcode(), FRem->getType(), Func))
       return "";
     FRem->deleteValue();
     return TLI->getName(Func);