initial cmq implementation

iritkatriel · Dec 10, 2024 · bd44a02 · bd44a02
1 parent c91ccbe
commit bd44a02
Show file tree

Hide file tree

Showing 21 changed files with 792 additions and 398 deletions.
diff --git a/Include/cpython/object.h b/Include/cpython/object.h
@@ -230,6 +230,9 @@ struct _typeobject {
     /* bitset of which type-watchers care about this type */
     unsigned char tp_watched;
     uint16_t tp_versions_used;
+
+    /* hooks to specializers */
+    binaryopspecfunc tp_binary_op_specialize;
 };
 
 /* This struct is used by the specializer

diff --git a/Include/internal/pycore_code.h b/Include/internal/pycore_code.h
@@ -100,6 +100,7 @@ typedef struct {
 
 typedef struct {
     _Py_BackoffCounter counter;
+    uint16_t external_cache[4];
 } _PyBinaryOpCache;
 
 #define INLINE_CACHE_ENTRIES_BINARY_OP CACHE_ENTRIES(_PyBinaryOpCache)
@@ -345,8 +346,8 @@ extern void _Py_Specialize_Call(_PyStackRef callable, _Py_CODEUNIT *instr,
                                 int nargs);
 extern void _Py_Specialize_CallKw(_PyStackRef callable, _Py_CODEUNIT *instr,
                                   int nargs);
-extern void _Py_Specialize_BinaryOp(_PyStackRef lhs, _PyStackRef rhs, _Py_CODEUNIT *instr,
-                                    int oparg, _PyStackRef *locals);
+extern int _Py_Specialize_BinaryOp(_PyStackRef lhs, _PyStackRef rhs, _Py_CODEUNIT *instr,
+                                   int oparg, _PyStackRef *locals);
 extern void _Py_Specialize_CompareOp(_PyStackRef lhs, _PyStackRef rhs,
                                      _Py_CODEUNIT *instr, int oparg);
 extern void _Py_Specialize_UnpackSequence(_PyStackRef seq, _Py_CODEUNIT *instr,
@@ -443,6 +444,12 @@ write_obj(uint16_t *p, PyObject *val)
     memcpy(p, &val, sizeof(val));
 }
 
+static inline void
+write_void(uint16_t *p, void *val)
+{
+    memcpy(p, &val, sizeof(val));
+}
+
 static inline uint16_t
 read_u16(uint16_t *p)
 {
@@ -473,6 +480,14 @@ read_obj(uint16_t *p)
     return val;
 }
 
+static inline void *
+read_void(uint16_t *p)
+{
+    void *val;
+    memcpy(&val, p, sizeof(val));
+    return val;
+}
+
 /* See Objects/exception_handling_notes.txt for details.
  */
 static inline unsigned char *

diff --git a/Include/internal/pycore_interp.h b/Include/internal/pycore_interp.h
@@ -285,13 +285,18 @@ struct _is {
     _PyThreadStateImpl _initial_thread;
     // _initial_thread should be the last field of PyInterpreterState.
     // See https://github.com/python/cpython/issues/127117.
+
+    PyBinaryOpSpecializationDescr* binary_op_specialization_list;
 };
 
 
 /* other API */
 
 extern void _PyInterpreterState_Clear(PyThreadState *tstate);
 
+extern PyBinaryOpSpecializationDescr* _Py_Specialize_NewBinaryOpSpecializationDescr(void);
+extern void _Py_Specialize_FreeBinaryOpSpecializationDescr(PyBinaryOpSpecializationDescr* descr);
+extern void _Py_Specialize_FreeAllSpecializationDescrs(PyInterpreterState *interp);
 
 static inline PyThreadState*
 _PyInterpreterState_GetFinalizing(PyInterpreterState *interp) {

diff --git a/Include/internal/pycore_magic_number.h b/Include/internal/pycore_magic_number.h
@@ -274,7 +274,7 @@ PC/launcher.c must also be updated.
 
 */
 
-#define PYC_MAGIC_NUMBER 3609
+#define PYC_MAGIC_NUMBER 3611
 /* This is equivalent to converting PYC_MAGIC_NUMBER to 2 bytes
    (little-endian) and then appending b'\r\n'. */
 #define PYC_MAGIC_NUMBER_TOKEN \

diff --git a/Include/internal/pycore_opcode_metadata.h b/Include/internal/pycore_opcode_metadata.h