Build changes for LLVM 16

Author: alexbaden

omniscidb/QueryEngine/CgenState.cpp

@@ -299,8 +299,7 @@ std::vector<std::string> CgenState::gpuFunctionsToReplace(llvm::Function* fn) {
   CHECK(!fn->isDeclaration());
 
   for (auto& basic_block : *fn) {
-    auto& inst_list = basic_block.getInstList();
-    for (auto inst_itr = inst_list.begin(); inst_itr != inst_list.end(); ++inst_itr) {
+    for (auto inst_itr = basic_block.begin(); inst_itr != basic_block.end(); ++inst_itr) {
       if (auto call_inst = llvm::dyn_cast<llvm::CallInst>(inst_itr)) {
         auto called_fcn = call_inst->getCalledFunction();
         CHECK(called_fcn);
@@ -332,8 +331,7 @@ void CgenState::replaceFunctionForGpu(const std::string& fcn_to_replace,
           << " for parent function " << fn->getName().str();
 
   for (auto& basic_block : *fn) {
-    auto& inst_list = basic_block.getInstList();
-    for (auto inst_itr = inst_list.begin(); inst_itr != inst_list.end(); ++inst_itr) {
+    for (auto inst_itr = basic_block.begin(); inst_itr != basic_block.end(); ++inst_itr) {
       if (auto call_inst = llvm::dyn_cast<llvm::CallInst>(inst_itr)) {
         auto called_fcn = call_inst->getCalledFunction();
         CHECK(called_fcn);

omniscidb/QueryEngine/Compiler/Backend.h

@@ -15,6 +15,7 @@
 #pragma once
 
 #include <llvm/IR/Value.h>
+#include <llvm/Transforms/IPO/PassManagerBuilder.h>
 #include <memory>
 
 #include "QueryEngine/ExtensionModules.h"

omniscidb/QueryEngine/Compiler/HelperFunctions.cpp

@@ -53,7 +53,12 @@ namespace compiler {
 std::string mangle_spirv_builtin(const llvm::Function& func) {
   CHECK(func.getName().startswith("__spirv_")) << func.getName().str();
   std::string new_name;
+#if LLVM_VERSION_MAJOR > 14
+  mangleOpenClBuiltin(
+      func.getName().str(), func.getArg(0)->getType(), /*pointer_types=*/{}, new_name);
+#else
   mangleOpenClBuiltin(func.getName().str(), func.getArg(0)->getType(), new_name);
+#endif
   return new_name;
 }
 #endif
@@ -213,7 +218,11 @@ void optimize_ir(llvm::Function* query_func,
   CGPM.addPass(AnnotateInternalFunctionsPass());
   MPM.addPass(createModuleToPostOrderCGSCCPassAdaptor(std::move(CGPM)));
 
+#if LLVM_VERSION_MAJOR > 15
+  FPM.addPass(llvm::SROAPass(llvm::SROAOptions::PreserveCFG));
+#else
   FPM.addPass(llvm::SROAPass());
+#endif
   // mem ssa drops unused load and store instructions, e.g. passing variables directly
   // where possible
   FPM.addPass(llvm::EarlyCSEPass(/*enable_mem_ssa=*/true));  // Catch trivial redundancies
@@ -231,7 +240,11 @@ void optimize_ir(llvm::Function* query_func,
   FPM.addPass(llvm::GVNPass());
 
   FPM.addPass(llvm::DSEPass());  // DeadStoreEliminationPass
+#if LLVM_VERSION_MAJOR > 14
+  LPM.addPass(llvm::LICMPass(llvm::LICMOptions()));
+#else
   LPM.addPass(llvm::LICMPass());
+#endif
   FPM.addPass(createFunctionToLoopPassAdaptor(std::move(LPM), /*UseMemorySSA=*/true));
 
   FPM.addPass(llvm::InstCombinePass());

omniscidb/QueryEngine/ExecutionEngineWrapper.h

@@ -74,9 +74,7 @@ class ORCJITExecutionEngineWrapper {
             data_layout_->getGlobalPrefix())));
   }
 
-  ~ORCJITExecutionEngineWrapper() {
-    llvm::cantFail(execution_session_->endSession());
-  }
+  ~ORCJITExecutionEngineWrapper() { llvm::cantFail(execution_session_->endSession()); }
 
   ORCJITExecutionEngineWrapper(const ORCJITExecutionEngineWrapper& other) = delete;
   ORCJITExecutionEngineWrapper(ORCJITExecutionEngineWrapper&& other) = delete;
@@ -102,9 +100,7 @@ class ORCJITExecutionEngineWrapper {
     return reinterpret_cast<void*>(symbol->getAddress());
   }
 
-  bool exists() const {
-    return !(execution_session_ == nullptr);
-  }
+  bool exists() const { return !(execution_session_ == nullptr); }
 
   void removeModule(llvm::Module* module) {
     // Do nothing here. Module is deleted by ORC after materialization.

omniscidb/QueryEngine/IRCodegen.cpp

@@ -934,8 +934,12 @@ void Executor::redeclareFilterFunction() {
   // copy the filter_func function body over
   // see
   // https://stackoverflow.com/questions/12864106/move-function-body-avoiding-full-cloning/18751365
+#if LLVM_VERSION_MAJOR > 15
+  filter_func2->splice(filter_func2->begin(), cgen_state_->filter_func_);
+#else
   filter_func2->getBasicBlockList().splice(
       filter_func2->begin(), cgen_state_->filter_func_->getBasicBlockList());
+#endif
 
   if (cgen_state_->current_func_ == cgen_state_->filter_func_) {
     cgen_state_->current_func_ = filter_func2;

omniscidb/QueryEngine/NativeCodegen.cpp

@@ -272,8 +272,12 @@ std::map<std::string, std::string> get_device_parameters(bool cpu_only) {
 
   result.insert(std::make_pair("cpu_name", llvm::sys::getHostCPUName()));
   result.insert(std::make_pair("cpu_triple", llvm::sys::getProcessTriple()));
+#if LLVM_VERSION_MAJOR > 15
+  result.insert(std::make_pair("cpu_cores", std::to_string(llvm::get_physical_cores())));
+#else
   result.insert(
       std::make_pair("cpu_cores", std::to_string(llvm::sys::getHostNumPhysicalCores())));
+#endif
   result.insert(std::make_pair("cpu_threads", std::to_string(cpu_threads())));
 
   // https://en.cppreference.com/w/cpp/language/types
@@ -1222,12 +1226,17 @@ std::vector<llvm::Value*> Executor::inlineHoistedLiterals() {
     query_func_literal_loads_function_arguments2[element.first] = argument_values2;
   }
 
-  // copy the row_func function body over
-  // see
-  // https://stackoverflow.com/questions/12864106/move-function-body-avoiding-full-cloning/18751365
+// copy the row_func function body over
+// see
+// https://stackoverflow.com/questions/12864106/move-function-body-avoiding-full-cloning/18751365
+#if LLVM_VERSION_MAJOR > 15
+  row_func_with_hoisted_literals->splice(row_func_with_hoisted_literals->begin(),
+                                         cgen_state_->row_func_);
+#else
   row_func_with_hoisted_literals->getBasicBlockList().splice(
       row_func_with_hoisted_literals->begin(),
       cgen_state_->row_func_->getBasicBlockList());
+#endif
 
   // also replace row_func arguments with the arguments from row_func_hoisted_literals
   for (llvm::Function::arg_iterator I = cgen_state_->row_func_->arg_begin(),
@@ -1271,10 +1280,14 @@ std::vector<llvm::Value*> Executor::inlineHoistedLiterals() {
     // copy the filter_func function body over
     // see
     // https://stackoverflow.com/questions/12864106/move-function-body-avoiding-full-cloning/18751365
+#if LLVM_VERSION_MAJOR > 15
+    filter_func_with_hoisted_literals->splice(filter_func_with_hoisted_literals->begin(),
+                                              cgen_state_->filter_func_);
+#else
     filter_func_with_hoisted_literals->getBasicBlockList().splice(
         filter_func_with_hoisted_literals->begin(),
         cgen_state_->filter_func_->getBasicBlockList());
-
+#endif
     // also replace filter_func arguments with the arguments from
     // filter_func_hoisted_literals
     for (llvm::Function::arg_iterator I = cgen_state_->filter_func_->arg_begin(),

omniscidb/QueryEngine/RowFuncBuilder.cpp

@@ -1324,7 +1324,11 @@ void RowFuncBuilder::codegenApproxQuantile(const size_t target_idx,
     calc = llvm::BasicBlock::Create(cs->context_, "calc_approx_quantile");
     skip = llvm::BasicBlock::Create(cs->context_, "skip_approx_quantile");
     irb.CreateCondBr(skip_cond, skip, calc);
+#if LLVM_VERSION_MAJOR > 15
+    cs->current_func_->insert(cs->current_func_->end(), calc);
+#else
     cs->current_func_->getBasicBlockList().push_back(calc);
+#endif
     irb.SetInsertPoint(calc);
   }
   if (!arg_type->isFloatingPoint()) {
@@ -1336,7 +1340,11 @@ void RowFuncBuilder::codegenApproxQuantile(const size_t target_idx,
       "agg_approx_quantile", llvm::Type::getVoidTy(cs->context_), agg_args);
   if (nullable) {
     irb.CreateBr(skip);
+#if LLVM_VERSION_MAJOR > 15
+    cs->current_func_->insert(cs->current_func_->end(), skip);
+#else
     cs->current_func_->getBasicBlockList().push_back(skip);
+#endif
     irb.SetInsertPoint(skip);
   }
 }