From 181082c1dfc02521f3f1b44c058af26b0884614a Mon Sep 17 00:00:00 2001
From: AndreaCorallo <andrea.corallo@arm.com>
Date: Sun, 8 Mar 2020 13:46:33 +0000
Subject: [PATCH] Add new version entry point
---
gcc/jit/docs/topics/compatibility.rst | 33 ++++++++++++++
gcc/jit/libgccjit++.h | 22 ++++++++++
gcc/jit/libgccjit.c | 46 ++++++++++++++++++++
gcc/jit/libgccjit.h | 16 +++++++
gcc/jit/libgccjit.map | 9 +++-
gcc/testsuite/jit.dg/all-non-failing-tests.h | 10 +++++
gcc/testsuite/jit.dg/test-version.c | 26 +++++++++++
7 files changed, 161 insertions(+), 1 deletion(-)
create mode 100644 gcc/testsuite/jit.dg/test-version.c
@@ -61,6 +61,28 @@ You can see the symbol tags provided by libgccjit.so using ``objdump``:
LIBGCCJIT_ABI_0
[...snip...]
+Programmatically checking version
+***************
+
+Client code can programmatically check libgccjit version using:
+
+.. function:: int gcc_jit_version_major (void)
+
+ Return libgccjit major version. This is analogous to __GNUC__ in C code.
+
+.. function:: int gcc_jit_version_minor (void)
+
+ Return libgccjit minor version. This is analogous to
+ __GNUC_MINOR__ in C code.
+
+.. function:: int gcc_jit_version_patchlevel (void)
+
+ Return libgccjit patchlevel version. This is analogous to
+ __GNUC_PATCHLEVEL__ in C code.
+
+.. note:: These entry points has been added with ``LIBGCCJIT_ABI_13``
+ (see below).
+
ABI symbol tags
***************
@@ -182,3 +204,14 @@ entrypoints:
--------------------
``LIBGCCJIT_ABI_12`` covers the addition of
:func:`gcc_jit_context_new_bitfield`
+
+``LIBGCCJIT_ABI_13``
+--------------------
+``LIBGCCJIT_ABI_13`` covers the addition of version functions via API
+entrypoints:
+
+ * :func:`gcc_jit_version_major`
+
+ * :func:`gcc_jit_version_minor`
+
+ * :func:`gcc_jit_version_patchlevel`
@@ -49,6 +49,8 @@ namespace gccjit
class timer;
class auto_time;
+ namespace version {};
+
/* Errors within the API become C++ exceptions of this class. */
class error
{
@@ -1913,6 +1915,26 @@ auto_time::~auto_time ()
m_timer.pop (m_item_name);
}
+namespace version
+{
+inline int
+major_v ()
+{
+ return gcc_jit_version_major ();
+}
+
+inline int
+minor_v ()
+{
+ return gcc_jit_version_minor ();
+}
+
+inline int
+patchlevel_v ()
+{
+ return gcc_jit_version_patchlevel ();
+}
+} // namespace version
} // namespace gccjit
#endif /* #ifndef LIBGCCJIT_PLUS_PLUS_H */
@@ -1487,6 +1487,22 @@ gcc_jit_context_new_rvalue_from_vector (gcc_jit_context *ctxt,
size_t num_elements,
gcc_jit_rvalue **elements);
+#define LIBGCCJIT_HAVE_gcc_jit_version
+
+/* Functions to retrive libgccjit version.
+ Analogous to __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ in C code.
+
+ These API entrypoints were added in LIBGCCJIT_ABI_13; you can test for their
+ presence using
+ #ifdef LIBGCCJIT_HAVE_gcc_jit_version
+ */
+extern int
+gcc_jit_version_major (void);
+extern int
+gcc_jit_version_minor (void);
+extern int
+gcc_jit_version_patchlevel (void);
+
#ifdef __cplusplus
}
#endif /* __cplusplus */
@@ -23,6 +23,8 @@ along with GCC; see the file COPYING3. If not see
#include "coretypes.h"
#include "timevar.h"
#include "typed-splay-tree.h"
+#include "cppbuiltin.h"
+#include <pthread.h>
#include "libgccjit.h"
#include "jit-recording.h"
@@ -3175,3 +3177,47 @@ gcc_jit_context_new_rvalue_from_vector (gcc_jit_context *ctxt,
as_vec_type,
(gcc::jit::recording::rvalue **)elements);
}
+
+/* A mutex around the cached state in parse_basever.
+ Ideally this would be within parse_basever, but the mutex is only needed
+ by libgccjit. */
+
+static pthread_mutex_t version_mutex = PTHREAD_MUTEX_INITIALIZER;
+
+struct version_info
+{
+ /* Default constructor. Populate via parse_basever,
+ guarded by version_mutex. */
+ version_info ()
+ {
+ pthread_mutex_lock (&version_mutex);
+ parse_basever (&major, &minor, &patchlevel);
+ pthread_mutex_unlock (&version_mutex);
+ }
+
+ int major;
+ int minor;
+ int patchlevel;
+};
+
+
+extern int
+gcc_jit_version_major (void)
+{
+ version_info vi;
+ return vi.major;
+}
+
+extern int
+gcc_jit_version_minor (void)
+{
+ version_info vi;
+ return vi.minor;
+}
+
+extern int
+gcc_jit_version_patchlevel (void)
+{
+ version_info vi;
+ return vi.patchlevel;
+}
@@ -179,4 +179,11 @@ LIBGCCJIT_ABI_11 {
LIBGCCJIT_ABI_12 {
global:
gcc_jit_context_new_bitfield;
-} LIBGCCJIT_ABI_11;
\ No newline at end of file
+} LIBGCCJIT_ABI_11;
+
+LIBGCCJIT_ABI_13 {
+ global:
+ gcc_jit_version_major;
+ gcc_jit_version_minor;
+ gcc_jit_version_patchlevel;
+} LIBGCCJIT_ABI_12;
\ No newline at end of file
@@ -254,6 +254,13 @@
/* test-vector-types.cc: We don't use this, since it's C++. */
+/* test-version.c */
+#define create_code create_code_version
+#define verify_code verify_code_version
+#include "test-version.c"
+#undef create_code
+#undef verify_code
+
/* test-volatile.c */
#define create_code create_code_volatile
#define verify_code verify_code_volatile
@@ -372,6 +379,9 @@ const struct testcase testcases[] = {
{"using_global",
create_code_using_global,
verify_code_using_global},
+ {"version",
+ create_code_version,
+ verify_code_version},
{"volatile",
create_code_volatile,
verify_code_volatile}
new file mode 100644
@@ -0,0 +1,26 @@
+#include <stdlib.h>
+#include <stdio.h>
+
+#include "libgccjit.h"
+
+#include "harness.h"
+
+#ifndef LIBGCCJIT_HAVE_gcc_jit_version
+#error LIBGCCJIT_HAVE_gcc_jit_version was not defined
+#endif
+
+void
+create_code (gcc_jit_context *ctxt, void *user_data)
+{
+ /* Do nothing. */
+}
+
+void
+verify_code (gcc_jit_context *ctxt, gcc_jit_result *result)
+{
+ if (!gcc_jit_version_major ())
+ fail ("Major version is zero");
+ /* Minor and patchlevel can be zero. */
+ gcc_jit_version_minor ();
+ gcc_jit_version_patchlevel ();
+}
--
2.17.1