jit: Changes for LLVM 17.

Changes required by https://llvm.org/docs/NewPassManager.html.

Back-patch to 12, leaving the final release of 11 unchanged, consistent
with earlier decision not to back-patch LLVM 16 support either.

Author: Dmitry Dolgov <[email protected]>
Reviewed-by: Andres Freund 
Reviewed-by: Thomas Munro 
Discussion: https://postgr.es/m/CA%2BhUKG%2BWXznXCyTgCADd%3DHWkP9Qksa6chd7L%3DGCnZo-MBgg9Lg%40mail.gmail.com

diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
index ea8f272887615ffca2c065046c790356e924b2f9..a9f1ce7a049b3fbd4aa58aa72004f38908317efc 100644 (file)
--- a/src/backend/jit/llvm/llvmjit.c
+++ b/src/backend/jit/llvm/llvmjit.c
@@ -18,6 +18,9 @@
 #include 
 #include 
 #include 
+#if LLVM_VERSION_MAJOR > 16
+#include 
+#endif
 #if LLVM_VERSION_MAJOR > 11
 #include 
 #include 
@@ -27,12 +30,14 @@
 #endif
 #include 
 #include 
+#if LLVM_VERSION_MAJOR < 17
 #include 
 #include 
 #include 
 #if LLVM_VERSION_MAJOR > 6
 #include 
 #endif
+#endif
 
 #include "jit/llvmjit.h"
 #include "jit/llvmjit_emit.h"
@@ -561,6 +566,7 @@ llvm_function_reference(LLVMJitContext *context,
 static void
 llvm_optimize_module(LLVMJitContext *context, LLVMModuleRef module)
 {
+#if LLVM_VERSION_MAJOR < 17
    LLVMPassManagerBuilderRef llvm_pmb;
    LLVMPassManagerRef llvm_mpm;
    LLVMPassManagerRef llvm_fpm;
@@ -624,6 +630,31 @@ llvm_optimize_module(LLVMJitContext *context, LLVMModuleRef module)
    LLVMDisposePassManager(llvm_mpm);
 
    LLVMPassManagerBuilderDispose(llvm_pmb);
+#else
+   LLVMPassBuilderOptionsRef options;
+   LLVMErrorRef err;
+   const char *passes;
+
+   if (context->base.flags & PGJIT_OPT3)
+       passes = "default";
+   else
+       passes = "default,mem2reg";
+
+   options = LLVMCreatePassBuilderOptions();
+
+#ifdef LLVM_PASS_DEBUG
+   LLVMPassBuilderOptionsSetDebugLogging(options, 1);
+#endif
+
+   LLVMPassBuilderOptionsSetInlinerThreshold(options, 512);
+
+   err = LLVMRunPasses(module, passes, NULL, options);
+
+   if (err)
+       elog(ERROR, "failed to JIT module: %s", llvm_error_message(err));
+
+   LLVMDisposePassBuilderOptions(options);
+#endif
 }
 
 /*

diff --git a/src/backend/jit/llvm/llvmjit_wrap.cpp b/src/backend/jit/llvm/llvmjit_wrap.cpp
index 2f450aaac5a958557a23c8b0b42fa0e3e6bb20ed..bab5b662490682cee86edbae45da34d4af1c09e9 100644 (file)
--- a/src/backend/jit/llvm/llvmjit_wrap.cpp
+++ b/src/backend/jit/llvm/llvmjit_wrap.cpp
@@ -23,8 +23,14 @@ extern "C"
 
 #include 
 #include 
+#if LLVM_VERSION_MAJOR < 17
 #include 
+#endif
+#if LLVM_VERSION_MAJOR > 16
+#include 
+#else
 #include 
+#endif
 
 #include "jit/llvmjit.h"