[GR-46908] Update HPy import to 0.9.0rc2.

PullRequest: graalpython/2904

Author: fangerer

graalpython/com.oracle.graal.python.hpy.llvm/CMakeLists.txt

@@ -98,7 +98,7 @@ target_include_directories(${TARGET_LIB} PRIVATE
 )
 
 target_compile_definitions(${TARGET_LIB} PRIVATE
-    HPY_UNIVERSAL_ABI
+    HPY_ABI_HYBRID
     NDEBUG
     GRAALVM_PYTHON_LLVM
     Py_BUILD_CORE

graalpython/com.oracle.graal.python.hpy.llvm/include/hpy.h

@@ -28,10 +28,59 @@
 extern "C" {
 #endif
 
-#ifndef HPY_UNIVERSAL_ABI
-/*  It would be nice if we could include hpy.h WITHOUT bringing in all the
-    stuff from Python.h, to make sure that people don't use the CPython API by
-    mistake. How to achieve it, though? */
+/* ~~~~~~~~~~~~~~~~ HPy ABI version ~~~~~~~~~~~~~~~ */
+// NOTE: these must be kept on sync with the equivalent variables in hpy/devel/abitag.py
+/**
+ * The ABI version.
+ *
+ * Minor version N+1 is binary compatible to minor version N. Major versions
+ * are not binary compatible (note: HPy can run several binary incompatible
+ * versions in one process).
+ */
+#define HPY_ABI_VERSION 0
+#define HPY_ABI_VERSION_MINOR 0
+#define HPY_ABI_TAG "hpy0"
+
+
+/* ~~~~~~~~~~~~~~~~ HPy ABI macros ~~~~~~~~~~~~~~~~ */
+
+/* The following macros are used to determine which kind of module we want to
+   compile. The build system must set one of these (e.g. by using `gcc
+   -D...`). This is the approach used by the setuptools support provided by
+   hpy.devel:
+
+     - HPY_ABI_CPYTHON
+     - HPY_ABI_UNIVERSAL
+     - HPY_ABI_HYBRID
+
+   In addition we also define HPY_ABI which is a string literal containing a
+   string representation of it.
+*/
+
+#if defined(HPY_ABI_CPYTHON)
+#  if defined(HPY_ABI_HYBRID)
+#    error "Conflicting macros are defined: HPY_ABI_CPYTHON and HPY_ABI_HYBRID"
+#  endif
+#  if defined(HPY_ABI_UNIVERSAL)
+#    error "Conflicting macros are defined: HPY_ABI_CPYTHON and HPY_ABI_UNIVERSAL"
+#  endif
+#  define HPY_ABI "cpython"
+
+#elif defined(HPY_ABI_HYBRID)
+#  if defined(HPY_ABI_UNIVERSAL)
+#    error "Conflicting macros are defined: HPY_ABI_HYBRID and HPY_ABI_UNIVERSAL"
+#  endif
+#  define HPY_ABI "hybrid"
+
+#elif defined(HPY_ABI_UNIVERSAL)
+#  define HPY_ABI "universal"
+
+#else
+#  error "Cannot determine the desired HPy ABI: you must set one of HPY_ABI_CPYTHON, HPY_ABI_UNIVERSAL or HPY_ABI_HYBRID"
+#endif
+
+
+#if defined(HPY_ABI_CPYTHON) || defined(HPY_ABI_HYBRID)
 #   define PY_SSIZE_T_CLEAN
 #   include <Python.h>
 #endif
@@ -49,6 +98,7 @@ extern "C" {
 #   define _HPy_HIDDEN
 #   define _HPy_UNUSED
 #endif /* __GNUC__ */
+#define _HPy_UNUSED_ARG(x) (__HPy_UNUSED_TAGGED ## x) _HPy_UNUSED
 
 #if defined(__clang__) || \
     (defined(__GNUC__) && \
@@ -61,6 +111,28 @@ extern "C" {
 #  define _HPy_NO_RETURN
 #endif
 
+
+// clang and gcc supports __has_attribute, MSVC doesn't. This should be enough
+// to be able to use it portably
+#ifdef __has_attribute
+#   define _HPY_compiler_has_attribute(x) __has_attribute(x)
+#else
+#   define _HPY_compiler_has_attribute(x) 0
+#endif
+
+#ifdef HPY_ABI_UNIVERSAL
+#  if _HPY_compiler_has_attribute(error)
+     // gcc, clang>=14
+#    define _HPY_LEGACY __attribute__((error("Cannot use legacy functions when targeting the HPy Universal ABI")))
+#  else
+     // we don't have any diagnostic feature, too bad
+#    define _HPY_LEGACY
+#  endif
+#else
+   // in non-universal modes, we don't attach any attribute
+#  define _HPY_LEGACY
+#endif
+
 #if defined(_MSC_VER) && defined(__cplusplus) // MSVC C4576
 #  define _hconv(h) {h}
 #  define _hfconv(h) {h}
@@ -91,6 +163,9 @@ extern "C" {
  */
 #define HPyAPI_FUNC   _HPy_UNUSED static inline
 
+/** An alias for ``HPyAPI_FUNC`` so we can handle it properly in the docs. */
+#define HPyAPI_INLINE_HELPER HPyAPI_FUNC
+
 /**
  * CPython implementations for ``HPyAPI_FUNC``
  * functions. Generally speaking, they are put in ctx_*.c files and they are
@@ -128,7 +203,8 @@ extern "C" {
 
        - PyPy: ._i is an index into a list
 
-       - GraalPython: ???
+       - GraalPy: ._i is a tagged value, either an index into a list,
+         or an immediate integer or double value
 
        - Debug mode: _i is a pointer to a DebugHandle, which contains a
          another HPy among other stuff
@@ -165,15 +241,12 @@ typedef struct { void* _i; } HPyThreadState;
 #define HPyListBuilder_IsNull(h) ((h)._lst == 0)
 #define HPyTupleBuilder_IsNull(h) ((h)._tup == 0)
 
-#define HPyListBuilder_IsNull(h) ((h)._lst == 0)
-#define HPyTupleBuilder_IsNull(h) ((h)._tup == 0)
-
 #define HPyField_NULL _hfconv(0)
 #define HPyField_IsNull(f) ((f)._i == 0)
 
 /* Convenience functions to cast between HPy and void*.  We need to decide
    whether these are part of the official API or not, and maybe introduce a
-   better naming convetion. For now, they are needed for ujson. */
+   better naming convention. For now, they are needed for ujson. */
 #ifndef GRAALVM_PYTHON_LLVM
 static inline HPy HPy_FromVoidP(void *p) { return _hconv((intptr_t)p); }
 static inline void* HPy_AsVoidP(HPy h) { return (void*)h._i; }
@@ -187,51 +260,75 @@ static inline void* HPy_AsVoidP(HPy h) { return h._i; }
 
 typedef struct _HPyContext_s HPyContext;
 
-#ifdef HPY_UNIVERSAL_ABI
+/** An enumeration of the different kinds of source code strings. */
+typedef enum {
+    /** Parse isolated expressions (e.g. ``a + b``). */
+    HPy_SourceKind_Expr = 0,
+
+    /**
+     * Parse sequences of statements as read from a file or other source. This
+     * is the symbol to use when compiling arbitrarily long Python source code.
+     */
+    HPy_SourceKind_File = 1,
+
+    /**
+     * Parse a single statement. This is the mode used for the interactive
+     * interpreter loop.
+     */
+    HPy_SourceKind_Single = 2,
+} HPy_SourceKind;
+
+#ifdef HPY_ABI_CPYTHON
+    typedef Py_ssize_t HPy_ssize_t;
+    typedef Py_hash_t HPy_hash_t;
+    typedef Py_UCS4 HPy_UCS4;
+
+#   define HPY_SSIZE_T_MAX PY_SSIZE_T_MAX
+#   define HPY_SSIZE_T_MIN PY_SSIZE_T_MIN
+
+#else
     typedef intptr_t HPy_ssize_t;
     typedef intptr_t HPy_hash_t;
     typedef uint32_t HPy_UCS4;
 
+#   define HPY_SSIZE_T_MAX INTPTR_MAX
+#   define HPY_SSIZE_T_MIN (-HPY_SSIZE_T_MAX-1)
+
     /* HPyCapsule field keys */
     typedef enum {
         HPyCapsule_key_Pointer = 0,
         HPyCapsule_key_Name = 1,
         HPyCapsule_key_Context = 2,
         HPyCapsule_key_Destructor = 3,
     } _HPyCapsule_key;
-
-#else
-    typedef Py_ssize_t HPy_ssize_t;
-    typedef Py_hash_t HPy_hash_t;
-    typedef Py_UCS4 HPy_UCS4;
 #endif
 
-typedef void (*HPyCapsule_Destructor)(const char *name, void *pointer, void *context);
-
 
 /* ~~~~~~~~~~~~~~~~ Additional #includes ~~~~~~~~~~~~~~~~ */
 
 #include "hpy/cpy_types.h"
+#include "hpy/hpyexports.h"
 #include "hpy/macros.h"
 #include "hpy/hpyfunc.h"
 #include "hpy/hpydef.h"
 #include "hpy/hpytype.h"
 #include "hpy/hpymodule.h"
 #include "hpy/runtime/argparse.h"
 #include "hpy/runtime/buildvalue.h"
+#include "hpy/runtime/format.h"
 #include "hpy/runtime/helpers.h"
 #include "hpy/runtime/structseq.h"
 
-#ifdef HPY_UNIVERSAL_ABI
-#   include "hpy/universal/autogen_ctx.h"
-#   include "hpy/universal/autogen_trampolines.h"
-#   include "hpy/universal/misc_trampolines.h"
-#else
-//  CPython-ABI
+#ifdef HPY_ABI_CPYTHON
+#   include "hpy/cpython/autogen_ctx.h"
 #   include "hpy/runtime/ctx_funcs.h"
 #   include "hpy/runtime/ctx_type.h"
 #   include "hpy/cpython/misc.h"
 #   include "hpy/cpython/autogen_api_impl.h"
+#else
+#   include "hpy/universal/autogen_ctx.h"
+#   include "hpy/universal/autogen_trampolines.h"
+#   include "hpy/universal/misc_trampolines.h"
 #endif
 
 #include "hpy/inline_helpers.h"

graalpython/com.oracle.graal.python.hpy.llvm/include/hpy/autogen_hpyfunc_declare.h

@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 
+
 /*
    DO NOT EDIT THIS FILE!
 
@@ -35,8 +36,8 @@
 
 #define _HPyFunc_DECLARE_HPyFunc_NOARGS(SYM) static HPy SYM(HPyContext *ctx, HPy self)
 #define _HPyFunc_DECLARE_HPyFunc_O(SYM) static HPy SYM(HPyContext *ctx, HPy self, HPy arg)
-#define _HPyFunc_DECLARE_HPyFunc_VARARGS(SYM) static HPy SYM(HPyContext *ctx, HPy self, HPy *args, HPy_ssize_t nargs)
-#define _HPyFunc_DECLARE_HPyFunc_KEYWORDS(SYM) static HPy SYM(HPyContext *ctx, HPy self, HPy *args, HPy_ssize_t nargs, HPy kw)
+#define _HPyFunc_DECLARE_HPyFunc_VARARGS(SYM) static HPy SYM(HPyContext *ctx, HPy self, const HPy *args, size_t nargs)
+#define _HPyFunc_DECLARE_HPyFunc_KEYWORDS(SYM) static HPy SYM(HPyContext *ctx, HPy self, const HPy *args, size_t nargs, HPy kwnames)
 #define _HPyFunc_DECLARE_HPyFunc_UNARYFUNC(SYM) static HPy SYM(HPyContext *ctx, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_BINARYFUNC(SYM) static HPy SYM(HPyContext *ctx, HPy, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_TERNARYFUNC(SYM) static HPy SYM(HPyContext *ctx, HPy, HPy, HPy)
@@ -59,7 +60,8 @@
 #define _HPyFunc_DECLARE_HPyFunc_ITERNEXTFUNC(SYM) static HPy SYM(HPyContext *ctx, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_DESCRGETFUNC(SYM) static HPy SYM(HPyContext *ctx, HPy, HPy, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_DESCRSETFUNC(SYM) static int SYM(HPyContext *ctx, HPy, HPy, HPy)
-#define _HPyFunc_DECLARE_HPyFunc_INITPROC(SYM) static int SYM(HPyContext *ctx, HPy self, HPy *args, HPy_ssize_t nargs, HPy kw)
+#define _HPyFunc_DECLARE_HPyFunc_INITPROC(SYM) static int SYM(HPyContext *ctx, HPy self, const HPy *args, HPy_ssize_t nargs, HPy kw)
+#define _HPyFunc_DECLARE_HPyFunc_NEWFUNC(SYM) static HPy SYM(HPyContext *ctx, HPy type, const HPy *args, HPy_ssize_t nargs, HPy kw)
 #define _HPyFunc_DECLARE_HPyFunc_GETTER(SYM) static HPy SYM(HPyContext *ctx, HPy, void *)
 #define _HPyFunc_DECLARE_HPyFunc_SETTER(SYM) static int SYM(HPyContext *ctx, HPy, HPy, void *)
 #define _HPyFunc_DECLARE_HPyFunc_OBJOBJPROC(SYM) static int SYM(HPyContext *ctx, HPy, HPy)
@@ -68,11 +70,12 @@
 #define _HPyFunc_DECLARE_HPyFunc_TRAVERSEPROC(SYM) static int SYM(void *object, HPyFunc_visitproc visit, void *arg)
 #define _HPyFunc_DECLARE_HPyFunc_DESTRUCTOR(SYM) static void SYM(HPyContext *ctx, HPy)
 #define _HPyFunc_DECLARE_HPyFunc_DESTROYFUNC(SYM) static void SYM(void *)
+#define _HPyFunc_DECLARE_HPyFunc_MOD_CREATE(SYM) static HPy SYM(HPyContext *ctx, HPy)
 
 typedef HPy (*HPyFunc_noargs)(HPyContext *ctx, HPy self);
 typedef HPy (*HPyFunc_o)(HPyContext *ctx, HPy self, HPy arg);
-typedef HPy (*HPyFunc_varargs)(HPyContext *ctx, HPy self, HPy *args, HPy_ssize_t nargs);
-typedef HPy (*HPyFunc_keywords)(HPyContext *ctx, HPy self, HPy *args, HPy_ssize_t nargs, HPy kw);
+typedef HPy (*HPyFunc_varargs)(HPyContext *ctx, HPy self, const HPy *args, size_t nargs);
+typedef HPy (*HPyFunc_keywords)(HPyContext *ctx, HPy self, const HPy *args, size_t nargs, HPy kwnames);
 typedef HPy (*HPyFunc_unaryfunc)(HPyContext *ctx, HPy);
 typedef HPy (*HPyFunc_binaryfunc)(HPyContext *ctx, HPy, HPy);
 typedef HPy (*HPyFunc_ternaryfunc)(HPyContext *ctx, HPy, HPy, HPy);
@@ -95,7 +98,8 @@ typedef HPy (*HPyFunc_getiterfunc)(HPyContext *ctx, HPy);
 typedef HPy (*HPyFunc_iternextfunc)(HPyContext *ctx, HPy);
 typedef HPy (*HPyFunc_descrgetfunc)(HPyContext *ctx, HPy, HPy, HPy);
 typedef int (*HPyFunc_descrsetfunc)(HPyContext *ctx, HPy, HPy, HPy);
-typedef int (*HPyFunc_initproc)(HPyContext *ctx, HPy self, HPy *args, HPy_ssize_t nargs, HPy kw);
+typedef int (*HPyFunc_initproc)(HPyContext *ctx, HPy self, const HPy *args, HPy_ssize_t nargs, HPy kw);
+typedef HPy (*HPyFunc_newfunc)(HPyContext *ctx, HPy type, const HPy *args, HPy_ssize_t nargs, HPy kw);
 typedef HPy (*HPyFunc_getter)(HPyContext *ctx, HPy, void *);
 typedef int (*HPyFunc_setter)(HPyContext *ctx, HPy, HPy, void *);
 typedef int (*HPyFunc_objobjproc)(HPyContext *ctx, HPy, HPy);
@@ -104,3 +108,4 @@ typedef void (*HPyFunc_releasebufferproc)(HPyContext *ctx, HPy, HPy_buffer *);
 typedef int (*HPyFunc_traverseproc)(void *object, HPyFunc_visitproc visit, void *arg);
 typedef void (*HPyFunc_destructor)(HPyContext *ctx, HPy);
 typedef void (*HPyFunc_destroyfunc)(void *);
+typedef HPy (*HPyFunc_mod_create)(HPyContext *ctx, HPy);

graalpython/com.oracle.graal.python.hpy.llvm/include/hpy/autogen_hpyslot.h

@@ -22,6 +22,7 @@
  * SOFTWARE.
  */
 
+
 /*
    DO NOT EDIT THIS FILE!
 
@@ -81,16 +82,19 @@ typedef enum {
     HPy_sq_length = 45,
     HPy_sq_repeat = 46,
     HPy_tp_call = 50,
+    HPy_tp_hash = 59,
     HPy_tp_init = 60,
-    HPy_tp_iter = 62,
     HPy_tp_new = 65,
     HPy_tp_repr = 66,
     HPy_tp_richcompare = 67,
+    HPy_tp_str = 70,
     HPy_tp_traverse = 71,
     HPy_nb_matrix_multiply = 75,
     HPy_nb_inplace_matrix_multiply = 76,
     HPy_tp_finalize = 80,
     HPy_tp_destroy = 1000,
+    HPy_mod_create = 2000,
+    HPy_mod_exec = 2001,
 } HPySlot_Slot;
 
 #define _HPySlot_SIG__HPy_bf_getbuffer HPyFunc_GETBUFFERPROC
@@ -140,13 +144,16 @@ typedef enum {
 #define _HPySlot_SIG__HPy_sq_length HPyFunc_LENFUNC
 #define _HPySlot_SIG__HPy_sq_repeat HPyFunc_SSIZEARGFUNC
 #define _HPySlot_SIG__HPy_tp_call HPyFunc_KEYWORDS
+#define _HPySlot_SIG__HPy_tp_hash HPyFunc_HASHFUNC
 #define _HPySlot_SIG__HPy_tp_init HPyFunc_INITPROC
-#define _HPySlot_SIG__HPy_tp_iter HPyFunc_GETITERFUNC
-#define _HPySlot_SIG__HPy_tp_new HPyFunc_KEYWORDS
+#define _HPySlot_SIG__HPy_tp_new HPyFunc_NEWFUNC
 #define _HPySlot_SIG__HPy_tp_repr HPyFunc_REPRFUNC
 #define _HPySlot_SIG__HPy_tp_richcompare HPyFunc_RICHCMPFUNC
+#define _HPySlot_SIG__HPy_tp_str HPyFunc_REPRFUNC
 #define _HPySlot_SIG__HPy_tp_traverse HPyFunc_TRAVERSEPROC
 #define _HPySlot_SIG__HPy_nb_matrix_multiply HPyFunc_BINARYFUNC
 #define _HPySlot_SIG__HPy_nb_inplace_matrix_multiply HPyFunc_BINARYFUNC
 #define _HPySlot_SIG__HPy_tp_finalize HPyFunc_DESTRUCTOR
 #define _HPySlot_SIG__HPy_tp_destroy HPyFunc_DESTROYFUNC
+#define _HPySlot_SIG__HPy_mod_create HPyFunc_MOD_CREATE
+#define _HPySlot_SIG__HPy_mod_exec HPyFunc_INQUIRY