AMDGPU: Move check of compatible libcall

[arsenm]

f63cdfc4cf87c6ae98e01fbe3e347ea4c882ac05

llvm/lib/Target/AMDGPU/AMDGPULibCalls.cpp

default:
     return false;
   }
 
   FuncInfo FInfo;
   if (!parseFunctionName(Callee->getName(), FInfo))
     return false;
 
   // Further check the number of arguments to see if they match.
-  if (CI->arg_size() != FInfo.getNumArgs())
+  // TODO: Check calling convention matches too
+  if (!FInfo.isCompatibleSignature(CI->getFunctionType()))
     return false;
 
   LLVM_DEBUG(dbgs() << "AMDIC: try folding " << *CI << '\n');
 
   if (TDOFold(CI, FInfo))
     return true;
 
   // Under unsafe-math, evaluate calls if possible.

llvm/lib/Target/AMDGPU/AMDGPULibFunc.h

public:
   const Param *getLeads() const;
 
   bool isMangled() const { return Impl->isMangled(); }
   void setId(EFuncId Id) { Impl->setId(Id); }
   bool parseFuncName(StringRef &MangledName) {
     return Impl->parseFuncName(MangledName);
   }
 
+  // Validate the call type matches the expected libfunc type.
+  bool isCompatibleSignature(const FunctionType *FuncTy) const;
+
   /// \return The mangled function name for mangled library functions
   /// and unmangled function name for unmangled library functions.
   std::string mangle() const { return Impl->mangle(); }
 
   void setName(StringRef N) { Impl->setName(N); }
   void setPrefix(ENamePrefix PFX) { Impl->setPrefix(PFX); }
 
   FunctionType *getFunctionType(Module &M) const {

llvm/lib/Target/AMDGPU/AMDGPULibFunc.cpp

 
 std::string AMDGPUMangledLibFunc::getName() const {
   SmallString<128> Buf;
   raw_svector_ostream OS(Buf);
   writeName(OS);
   return std::string(OS.str());
 }
 
+bool AMDGPULibFunc::isCompatibleSignature(const FunctionType *FuncTy) const {
+  // TODO: Validate types make sense
+  return !FuncTy->isVarArg() && FuncTy->getNumParams() == getNumArgs();
+}
+
 Function *AMDGPULibFunc::getFunction(Module *M, const AMDGPULibFunc &fInfo) {
   std::string FuncName = fInfo.mangle();
   Function *F = dyn_cast_or_null<Function>(
     M->getValueSymbolTable().lookup(FuncName));
 
   // check formal with actual types conformance
-  if (F && !F->isDeclaration()
-        && !F->isVarArg()
-        && F->arg_size() == fInfo.getNumArgs()) {
+  if (F && !F->isDeclaration() &&
+      fInfo.isCompatibleSignature(F->getFunctionType()))
     return F;
-  }
+
   return nullptr;
 }
 
 FunctionCallee AMDGPULibFunc::getOrInsertFunction(Module *M,
                                                   const AMDGPULibFunc &fInfo) {
   std::string const FuncName = fInfo.mangle();
   Function *F = dyn_cast_or_null<Function>(
     M->getValueSymbolTable().lookup(FuncName));
 
   // check formal with actual types conformance
-  if (F && !F->isDeclaration()
-        && !F->isVarArg()
-        && F->arg_size() == fInfo.getNumArgs()) {
+  if (F && !F->isDeclaration() &&
+      fInfo.isCompatibleSignature(F->getFunctionType()))
     return F;
-  }
 
   FunctionType *FuncTy = fInfo.getFunctionType(*M);
 
   bool hasPtr = false;
   for (FunctionType::param_iterator
          PI = FuncTy->param_begin(),
          PE = FuncTy->param_end();
        PI != PE; ++PI) {