Merge pull request #274 from facebookresearch/llvm7

Update for LLVM JIT API Churn

Author: wsmoses

tc/core/polyhedral/llvm_jit.cc

@@ -25,6 +25,7 @@
 #include "llvm/IR/Verifier.h"
 #include "llvm/Passes/PassBuilder.h"
 #include "llvm/Support/DynamicLibrary.h"
+#include "llvm/Transforms/Utils/Cloning.h"
 
 #include "tc/core/flags.h"
 #include "tc/core/polyhedral/codegen_llvm.h"
@@ -68,6 +69,7 @@ std::string find_library_path(std::string library) {
 
 namespace tc {
 
+#if LLVM_VERSION_MAJOR <= 6
 Jit::Jit()
     : TM_(EngineBuilder().selectTarget()),
       DL_(TM_->createDataLayout()),
@@ -82,20 +84,7 @@ Jit::Jit()
   }
 }
 
-std::shared_ptr<Module> Jit::codegenScop(
-    const std::string& specializedName,
-    const polyhedral::Scop& scop) {
-  std::shared_ptr<Module> mod = emitLLVMKernel(
-      specializedName, scop, getTargetMachine().createDataLayout());
-  addModule(mod);
-  return mod;
-}
-
-TargetMachine& Jit::getTargetMachine() {
-  return *TM_;
-}
-
-Jit::ModuleHandle Jit::addModule(std::shared_ptr<Module> M) {
+void Jit::addModule(std::shared_ptr<Module> M) {
   M->setTargetTriple(TM_->getTargetTriple().str());
   auto Resolver = orc::createLambdaResolver(
       [&](const std::string& Name) {
@@ -111,7 +100,63 @@ Jit::ModuleHandle Jit::addModule(std::shared_ptr<Module> M) {
 
   auto res = compileLayer_.addModule(M, std::move(Resolver));
   CHECK(res) << "Failed to jit compile.";
-  return *res;
+}
+#else
+Jit::Jit()
+    : SSP(),
+      ES(SSP),
+      Resolver(llvm::orc::createLegacyLookupResolver(
+          [this](const std::string& Name) -> JITSymbol {
+            if (auto Sym = compileLayer_.findSymbol(Name, false))
+              return Sym;
+            else if (auto Err = Sym.takeError())
+              return std::move(Err);
+            if (auto SymAddr =
+                    RTDyldMemoryManager::getSymbolAddressInProcess(Name))
+              return JITSymbol(SymAddr, JITSymbolFlags::Exported);
+            return nullptr;
+          },
+          [](Error err) { throw std::runtime_error("Lookup failed!"); })),
+      TM_(EngineBuilder().selectTarget()),
+      DL_(TM_->createDataLayout()),
+      objectLayer_(
+          ES,
+          [this](llvm::orc::VModuleKey) {
+            return llvm::orc::RTDyldObjectLinkingLayer::Resources{
+                std::make_shared<SectionMemoryManager>(), Resolver};
+          }),
+      compileLayer_(objectLayer_, orc::SimpleCompiler(*TM_)) {
+  std::string err;
+
+  sys::DynamicLibrary::LoadLibraryPermanently(nullptr, &err);
+  if (err != "") {
+    throw std::runtime_error("Failed to find cilkrts: " + err);
+  }
+}
+
+// Note that this copy may cause tapir tests to fail
+// However, this code will never use tapir code
+// and once the LLVM API churn stops, will be modified
+// to be properly compatable.
+void Jit::addModule(std::shared_ptr<Module> M) {
+  M->setTargetTriple(TM_->getTargetTriple().str());
+  auto K = ES.allocateVModule();
+  llvm::Error res = compileLayer_.addModule(K, CloneModule(*M));
+  CHECK(!res) << "Failed to jit compile.";
+}
+#endif
+
+std::shared_ptr<Module> Jit::codegenScop(
+    const std::string& specializedName,
+    const polyhedral::Scop& scop) {
+  std::shared_ptr<Module> mod = emitLLVMKernel(
+      specializedName, scop, getTargetMachine().createDataLayout());
+  addModule(mod);
+  return mod;
+}
+
+TargetMachine& Jit::getTargetMachine() {
+  return *TM_;
 }
 
 JITSymbol Jit::findSymbol(const std::string Name) {

tc/core/polyhedral/llvm_jit.h

@@ -21,6 +21,10 @@
 #include "llvm/ExecutionEngine/Orc/RTDyldObjectLinkingLayer.h"
 #include "llvm/Target/TargetMachine.h"
 
+#if LLVM_VERSION_MAJOR > 6
+#include "llvm/ExecutionEngine/Orc/Core.h"
+#endif
+
 namespace tc {
 
 namespace polyhedral {
@@ -29,6 +33,11 @@ class Scop;
 
 class Jit {
  private:
+#if LLVM_VERSION_MAJOR > 6
+  llvm::orc::SymbolStringPool SSP;
+  llvm::orc::ExecutionSession ES;
+  std::shared_ptr<llvm::orc::SymbolResolver> Resolver;
+#endif
   std::unique_ptr<llvm::TargetMachine> TM_;
   const llvm::DataLayout DL_;
   llvm::orc::RTDyldObjectLinkingLayer objectLayer_;
@@ -38,12 +47,10 @@ class Jit {
  public:
   Jit();
 
-  using ModuleHandle = decltype(compileLayer_)::ModuleHandleT;
   std::shared_ptr<llvm::Module> codegenScop(
       const std::string& specializedName,
       const polyhedral::Scop& scop);
-  ModuleHandle addModule(std::shared_ptr<llvm::Module> M);
-  void removeModule(ModuleHandle H);
+  void addModule(std::shared_ptr<llvm::Module> M);
 
   llvm::JITSymbol findSymbol(const std::string name);
   llvm::JITTargetAddress getSymbolAddress(const std::string name);