Skip to content

Commit 1b957e5

Browse files
anarazelanarazel
committed
LLVMJIT: Adapt to API changes in gdb and perf support.
During the work of upstreaming my previous patches for gdb and perf support the API changed. Adapt. Normally this wouldn't necessarily be something to backpatch, but the previous API wasn't upstream, and at least the gdb support is quite useful for debugging. Author: Andres Freund Backpatch: 11, where LLVM based JIT support was added.
1 parent 9820f5c commit 1b957e5

File tree

5 files changed

+40
-33
lines changed

5 files changed

+40
-33
lines changed

‎config/llvm.m4

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,9 @@ AC_DEFUN([PGAC_LLVM_SUPPORT],
9494
# Check which functionality is present
9595
SAVE_CPPFLAGS="$CPPFLAGS"
9696
CPPFLAGS="$CPPFLAGS $LLVM_CPPFLAGS"
97-
AC_CHECK_DECLS([LLVMOrcGetSymbolAddressIn, LLVMOrcRegisterGDB, LLVMOrcRegisterPerf], [], [], [[#include <llvm-c/OrcBindings.h>]])
97+
AC_CHECK_DECLS([LLVMOrcGetSymbolAddressIn], [], [], [[#include <llvm-c/OrcBindings.h>]])
9898
AC_CHECK_DECLS([LLVMGetHostCPUName], [], [], [[#include <llvm-c/TargetMachine.h>]])
99+
AC_CHECK_DECLS([LLVMCreateGDBRegistrationListener, LLVMCreatePerfJITEventListener], [], [], [[#include <llvm-c/ExecutionEngine.h>]])
99100
CPPFLAGS="$SAVE_CPPFLAGS"
100101
101102
# LLVM_CONFIG, CLANG are already output via AC_ARG_VAR

‎configure

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5008,39 +5008,40 @@ fi
50085008
cat >>confdefs.h <<_ACEOF
50095009
#define HAVE_DECL_LLVMORCGETSYMBOLADDRESSIN $ac_have_decl
50105010
_ACEOF
5011-
ac_fn_c_check_decl "$LINENO" "LLVMOrcRegisterGDB" "ac_cv_have_decl_LLVMOrcRegisterGDB" "#include <llvm-c/OrcBindings.h>
5011+
5012+
ac_fn_c_check_decl "$LINENO" "LLVMGetHostCPUName" "ac_cv_have_decl_LLVMGetHostCPUName" "#include <llvm-c/TargetMachine.h>
50125013
"
5013-
if test "x$ac_cv_have_decl_LLVMOrcRegisterGDB" = xyes; then :
5014+
if test "x$ac_cv_have_decl_LLVMGetHostCPUName" = xyes; then :
50145015
ac_have_decl=1
50155016
else
50165017
ac_have_decl=0
50175018
fi
50185019

50195020
cat >>confdefs.h <<_ACEOF
5020-
#define HAVE_DECL_LLVMORCREGISTERGDB $ac_have_decl
5021+
#define HAVE_DECL_LLVMGETHOSTCPUNAME $ac_have_decl
50215022
_ACEOF
5022-
ac_fn_c_check_decl "$LINENO" "LLVMOrcRegisterPerf" "ac_cv_have_decl_LLVMOrcRegisterPerf" "#include <llvm-c/OrcBindings.h>
5023+
5024+
ac_fn_c_check_decl "$LINENO" "LLVMCreateGDBRegistrationListener" "ac_cv_have_decl_LLVMCreateGDBRegistrationListener" "#include <llvm-c/ExecutionEngine.h>
50235025
"
5024-
if test "x$ac_cv_have_decl_LLVMOrcRegisterPerf" = xyes; then :
5026+
if test "x$ac_cv_have_decl_LLVMCreateGDBRegistrationListener" = xyes; then :
50255027
ac_have_decl=1
50265028
else
50275029
ac_have_decl=0
50285030
fi
50295031

50305032
cat >>confdefs.h <<_ACEOF
5031-
#define HAVE_DECL_LLVMORCREGISTERPERF $ac_have_decl
5033+
#define HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER $ac_have_decl
50325034
_ACEOF
5033-
5034-
ac_fn_c_check_decl "$LINENO" "LLVMGetHostCPUName" "ac_cv_have_decl_LLVMGetHostCPUName" "#include <llvm-c/TargetMachine.h>
5035+
ac_fn_c_check_decl "$LINENO" "LLVMCreatePerfJITEventListener" "ac_cv_have_decl_LLVMCreatePerfJITEventListener" "#include <llvm-c/ExecutionEngine.h>
50355036
"
5036-
if test "x$ac_cv_have_decl_LLVMGetHostCPUName" = xyes; then :
5037+
if test "x$ac_cv_have_decl_LLVMCreatePerfJITEventListener" = xyes; then :
50375038
ac_have_decl=1
50385039
else
50395040
ac_have_decl=0
50405041
fi
50415042

50425043
cat >>confdefs.h <<_ACEOF
5043-
#define HAVE_DECL_LLVMGETHOSTCPUNAME $ac_have_decl
5044+
#define HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER $ac_have_decl
50445045
_ACEOF
50455046

50465047
CPPFLAGS="$SAVE_CPPFLAGS"

‎src/backend/jit/llvm/llvmjit.c

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include <llvm-c/BitReader.h>
2929
#include <llvm-c/BitWriter.h>
3030
#include <llvm-c/Core.h>
31+
#include <llvm-c/ExecutionEngine.h>
3132
#include <llvm-c/OrcBindings.h>
3233
#include <llvm-c/Support.h>
3334
#include <llvm-c/Target.h>
@@ -666,18 +667,22 @@ llvm_session_initialize(void)
666667
llvm_opt0_orc = LLVMOrcCreateInstance(llvm_opt0_targetmachine);
667668
llvm_opt3_orc = LLVMOrcCreateInstance(llvm_opt3_targetmachine);
668669

669-
#if defined(HAVE_DECL_LLVMORCREGISTERGDB) && HAVE_DECL_LLVMORCREGISTERGDB
670+
#if defined(HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER) && HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER
670671
if (jit_debugging_support)
671672
{
672-
LLVMOrcRegisterGDB(llvm_opt0_orc);
673-
LLVMOrcRegisterGDB(llvm_opt3_orc);
673+
LLVMJITEventListenerRef l = LLVMCreateGDBRegistrationListener();
674+
675+
LLVMOrcRegisterJITEventListener(llvm_opt0_orc, l);
676+
LLVMOrcRegisterJITEventListener(llvm_opt3_orc, l);
674677
}
675678
#endif
676-
#if defined(HAVE_DECL_LLVMORCREGISTERPERF) && HAVE_DECL_LLVMORCREGISTERPERF
679+
#if defined(HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER) && HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER
677680
if (jit_profiling_support)
678681
{
679-
LLVMOrcRegisterPerf(llvm_opt0_orc);
680-
LLVMOrcRegisterPerf(llvm_opt3_orc);
682+
LLVMJITEventListenerRef l = LLVMCreatePerfJITEventListener();
683+
684+
LLVMOrcRegisterJITEventListener(llvm_opt0_orc, l);
685+
LLVMOrcRegisterJITEventListener(llvm_opt3_orc, l);
681686
}
682687
#endif
683688

‎src/include/pg_config.h.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,14 @@
134134
don't. */
135135
#undef HAVE_DECL_F_FULLFSYNC
136136

137+
/* Define to 1 if you have the declaration of
138+
`LLVMCreateGDBRegistrationListener', and to 0 if you don't. */
139+
#undef HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER
140+
141+
/* Define to 1 if you have the declaration of
142+
`LLVMCreatePerfJITEventListener', and to 0 if you don't. */
143+
#undef HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER
144+
137145
/* Define to 1 if you have the declaration of `LLVMGetHostCPUName', and to 0
138146
if you don't. */
139147
#undef HAVE_DECL_LLVMGETHOSTCPUNAME
@@ -142,14 +150,6 @@
142150
to 0 if you don't. */
143151
#undef HAVE_DECL_LLVMORCGETSYMBOLADDRESSIN
144152

145-
/* Define to 1 if you have the declaration of `LLVMOrcRegisterGDB', and to 0
146-
if you don't. */
147-
#undef HAVE_DECL_LLVMORCREGISTERGDB
148-
149-
/* Define to 1 if you have the declaration of `LLVMOrcRegisterPerf', and to 0
150-
if you don't. */
151-
#undef HAVE_DECL_LLVMORCREGISTERPERF
152-
153153
/* Define to 1 if you have the declaration of `posix_fadvise', and to 0 if you
154154
don't. */
155155
#undef HAVE_DECL_POSIX_FADVISE

‎src/include/pg_config.h.win32

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,14 @@
107107
don't. */
108108
#define HAVE_DECL_F_FULLFSYNC 0
109109

110+
/* Define to 1 if you have the declaration of
111+
`LLVMCreateGDBRegistrationListener', and to 0 if you don't. */
112+
#undef HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER
113+
114+
/* Define to 1 if you have the declaration of
115+
`LLVMCreatePerfJITEventListener', and to 0 if you don't. */
116+
#undef HAVE_DECL_LLVMCREATEPERFJITEVENTLISTENER
117+
110118
/* Define to 1 if you have the declaration of `LLVMGetHostCPUName', and to 0
111119
if you don't. */
112120
#define HAVE_DECL_LLVMGETHOSTCPUNAME 0
@@ -115,14 +123,6 @@
115123
to 0 if you don't. */
116124
#define HAVE_DECL_LLVMORCGETSYMBOLADDRESSIN 0
117125

118-
/* Define to 1 if you have the declaration of `LLVMOrcRegisterGDB', and to 0
119-
if you don't. */
120-
#define HAVE_DECL_LLVMORCREGISTERGDB 0
121-
122-
/* Define to 1 if you have the declaration of `LLVMOrcRegisterPerf', and to 0
123-
if you don't. */
124-
#define HAVE_DECL_LLVMORCREGISTERPERF 0
125-
126126
/* Define to 1 if you have the declaration of `snprintf', and to 0 if you
127127
don't. */
128128
#define HAVE_DECL_SNPRINTF 1

0 commit comments

Comments
 (0)