Move helper function to TargetLoweringBase

Author: steplong

llvm/include/llvm/Analysis/TargetLibraryInfo.h

@@ -10,7 +10,6 @@
 #define LLVM_ANALYSIS_TARGETLIBRARYINFO_H
 
 #include "llvm/ADT/DenseMap.h"
-#include "llvm/CodeGen/ISDOpcodes.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Module.h"
@@ -458,21 +457,6 @@ class TargetLibraryInfo {
     return Impl->CustomNames.find(F)->second;
   }
 
-  static unsigned getISDNode(Intrinsic::ID ID) {
-    unsigned Node;
-    switch (ID) {
-    case Intrinsic::exp:
-      Node = ISD::FEXP;
-      break;
-    case Intrinsic::exp2:
-      Node = ISD::FEXP2;
-      break;
-    default:
-      llvm_unreachable("Intrinsic ID not supported yet");
-    }
-    return Node;
-  }
-
   static void initExtensionsForTriple(bool &ShouldExtI32Param,
                                       bool &ShouldExtI32Return,
                                       bool &ShouldSignExtI32Param,

llvm/include/llvm/CodeGen/TargetLowering.h

@@ -2123,6 +2123,9 @@ class TargetLoweringBase {
   /// Get the ISD node that corresponds to the Instruction class opcode.
   int InstructionOpcodeToISD(unsigned Opcode) const;
 
+  /// Get the ISD node that corresponds to the Intrinsic ID.
+  int IntrinsicIDToISD(Intrinsic::ID ID) const;
+
   /// @}
 
   //===--------------------------------------------------------------------===//

llvm/lib/CodeGen/PreISelIntrinsicLowering.cpp

@@ -461,7 +461,7 @@ bool PreISelIntrinsicLowering::lowerIntrinsics(Module &M) const {
         if (!isa<ScalableVectorType>(Ty))
           return false;
         const TargetLowering *TL = TM->getSubtargetImpl(F)->getTargetLowering();
-        unsigned Op = TargetLibraryInfo::getISDNode(F.getIntrinsicID());
+        unsigned Op = TL->IntrinsicIDToISD(F.getIntrinsicID());
         if (!TL->isOperationExpand(Op, EVT::getEVT(Ty)))
           return false;
         return lowerUnaryVectorIntrinsicAsLoop(M, CI);

llvm/lib/CodeGen/TargetLoweringBase.cpp

@@ -1841,6 +1841,16 @@ int TargetLoweringBase::InstructionOpcodeToISD(unsigned Opcode) const {
   llvm_unreachable("Unknown instruction type encountered!");
 }
 
+int TargetLoweringBase::IntrinsicIDToISD(Intrinsic::ID ID) const {
+  switch (ID) {
+  case Intrinsic::exp:
+    return ISD::FEXP;
+  case Intrinsic::exp2:
+    return ISD::FEXP2;
+  }
+  llvm_unreachable("Unsupported Intrinsic ID encountered!");
+}
+
 Value *
 TargetLoweringBase::getDefaultSafeStackPointerLocation(IRBuilderBase &IRB,
                                                        bool UseTLS) const {