mirror of https://github.com/python/cpython
GH-104584: Plugin optimizer API (GH-105100)
This commit is contained in:
Mark Shannon
GitHub
parent
601ae09f0c
commit
4bfa01b9d9
|
|
@ -105,5 +105,6 @@
|
|||
#include "fileutils.h"
|
||||
#include "cpython/pyfpe.h"
|
||||
#include "tracemalloc.h"
|
||||
#include "cpython/optimizer.h"
|
||||
|
||||
#endif /* !Py_PYTHON_H */
|
||||
|
|
|
|||
|
|
@ -76,6 +76,13 @@ typedef struct {
|
|||
int8_t line_delta;
|
||||
} _PyCoLineInstrumentationData;
|
||||
|
||||
|
||||
typedef struct {
|
||||
int size;
|
||||
int capacity;
|
||||
struct _PyExecutorObject *executors[1];
|
||||
} _PyExecutorArray;
|
||||
|
||||
/* Main data structure used for instrumentation.
|
||||
* This is allocated when needed for instrumentation
|
||||
*/
|
||||
|
|
@ -153,6 +160,7 @@ typedef struct {
|
|||
PyObject *co_qualname; /* unicode (qualname, for reference) */ \
|
||||
PyObject *co_linetable; /* bytes object that holds location info */ \
|
||||
PyObject *co_weakreflist; /* to support weakrefs to code objects */ \
|
||||
_PyExecutorArray *co_executors; /* executors from optimizer */ \
|
||||
_PyCoCached *_co_cached; /* cached co_* attributes */ \
|
||||
uint64_t _co_instrumentation_version; /* current instrumentation version */ \
|
||||
_PyCoMonitoringData *_co_monitoring; /* Monitoring data */ \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,54 @@
|
|||
|
||||
#ifndef Py_LIMITED_API
|
||||
#ifndef Py_OPTIMIZER_H
|
||||
#define Py_OPTIMIZER_H
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
typedef struct {
|
||||
uint8_t opcode;
|
||||
uint8_t oparg;
|
||||
} _PyVMData;
|
||||
|
||||
typedef struct _PyExecutorObject {
|
||||
PyObject_HEAD
|
||||
/* WARNING: execute consumes a reference to self. This is necessary to allow executors to tail call into each other. */
|
||||
struct _PyInterpreterFrame *(*execute)(struct _PyExecutorObject *self, struct _PyInterpreterFrame *frame, PyObject **stack_pointer);
|
||||
_PyVMData vm_data; /* Used by the VM, but opaque to the optimizer */
|
||||
/* Data needed by the executor goes here, but is opaque to the VM */
|
||||
} _PyExecutorObject;
|
||||
|
||||
typedef struct _PyOptimizerObject _PyOptimizerObject;
|
||||
|
||||
typedef _PyExecutorObject *(*optimize_func)(_PyOptimizerObject* self, PyCodeObject *code, _Py_CODEUNIT *instr);
|
||||
|
||||
typedef struct _PyOptimizerObject {
|
||||
PyObject_HEAD
|
||||
optimize_func optimize;
|
||||
uint16_t resume_threshold;
|
||||
uint16_t backedge_threshold;
|
||||
/* Data needed by the optimizer goes here, but is opaque to the VM */
|
||||
} _PyOptimizerObject;
|
||||
|
||||
PyAPI_FUNC(int) PyUnstable_Replace_Executor(PyCodeObject *code, _Py_CODEUNIT *instr, _PyExecutorObject *executor);
|
||||
|
||||
PyAPI_FUNC(void) PyUnstable_SetOptimizer(_PyOptimizerObject* optimizer);
|
||||
|
||||
PyAPI_FUNC(_PyOptimizerObject *) PyUnstable_GetOptimizer(void);
|
||||
|
||||
struct _PyInterpreterFrame *
|
||||
_PyOptimizer_BackEdge(struct _PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNIT *dest, PyObject **stack_pointer);
|
||||
|
||||
extern _PyOptimizerObject _PyOptimizer_Default;
|
||||
|
||||
/* For testing */
|
||||
PyAPI_FUNC(PyObject *)PyUnstable_Optimizer_NewCounter(void);
|
||||
|
||||
#define OPTIMIZER_BITS_IN_COUNTER 4
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
#endif /* !Py_OPTIMIZER_H */
|
||||
#endif /* Py_LIMITED_API */
|
||||
|
|
@ -487,6 +487,7 @@ extern int _Py_Instrument(PyCodeObject *co, PyInterpreterState *interp);
|
|||
|
||||
extern int _Py_GetBaseOpcode(PyCodeObject *code, int offset);
|
||||
|
||||
extern int _PyInstruction_GetLength(PyCodeObject *code, int offset);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
|
|
|
|||
|
|
@ -160,6 +160,9 @@ struct _is {
|
|||
struct types_state types;
|
||||
struct callable_cache callable_cache;
|
||||
PyCodeObject *interpreter_trampoline;
|
||||
_PyOptimizerObject *optimizer;
|
||||
uint16_t optimizer_resume_threshold;
|
||||
uint16_t optimizer_backedge_threshold;
|
||||
|
||||
_Py_Monitors monitors;
|
||||
bool f_opcode_trace_set;
|
||||
|
|
|
|||
|
|
@ -42,6 +42,7 @@ const uint8_t _PyOpcode_Caches[256] = {
|
|||
[LOAD_GLOBAL] = 4,
|
||||
[BINARY_OP] = 1,
|
||||
[SEND] = 1,
|
||||
[JUMP_BACKWARD] = 1,
|
||||
[LOAD_SUPER_ATTR] = 1,
|
||||
[CALL] = 3,
|
||||
};
|
||||
|
|
@ -114,6 +115,7 @@ const uint8_t _PyOpcode_Deopt[256] = {
|
|||
[END_ASYNC_FOR] = END_ASYNC_FOR,
|
||||
[END_FOR] = END_FOR,
|
||||
[END_SEND] = END_SEND,
|
||||
[ENTER_EXECUTOR] = ENTER_EXECUTOR,
|
||||
[EXTENDED_ARG] = EXTENDED_ARG,
|
||||
[FORMAT_VALUE] = FORMAT_VALUE,
|
||||
[FOR_ITER] = FOR_ITER,
|
||||
|
|
@ -475,7 +477,7 @@ static const char *const _PyOpcode_OpName[267] = {
|
|||
[227] = "<227>",
|
||||
[228] = "<228>",
|
||||
[229] = "<229>",
|
||||
[230] = "<230>",
|
||||
[ENTER_EXECUTOR] = "ENTER_EXECUTOR",
|
||||
[231] = "<231>",
|
||||
[232] = "<232>",
|
||||
[233] = "<233>",
|
||||
|
|
@ -571,7 +573,6 @@ static const char *const _PyOpcode_OpName[267] = {
|
|||
case 227: \
|
||||
case 228: \
|
||||
case 229: \
|
||||
case 230: \
|
||||
case 231: \
|
||||
case 232: \
|
||||
case 233: \
|
||||
|
|
|
|||
|
|
@ -120,6 +120,7 @@ extern "C" {
|
|||
#define CALL_INTRINSIC_2 174
|
||||
#define LOAD_FROM_DICT_OR_GLOBALS 175
|
||||
#define LOAD_FROM_DICT_OR_DEREF 176
|
||||
#define ENTER_EXECUTOR 230
|
||||
#define MIN_INSTRUMENTED_OPCODE 237
|
||||
#define INSTRUMENTED_LOAD_SUPER_ATTR 237
|
||||
#define INSTRUMENTED_POP_JUMP_IF_NONE 238
|
||||
|
|
|
|||
|
|
@ -70,6 +70,7 @@ typedef struct _object_stats {
|
|||
uint64_t type_cache_dunder_hits;
|
||||
uint64_t type_cache_dunder_misses;
|
||||
uint64_t type_cache_collisions;
|
||||
uint64_t optimization_attempts;
|
||||
} ObjectStats;
|
||||
|
||||
typedef struct _stats {
|
||||
|
|
|
|||
|
|
@ -445,8 +445,9 @@ _code_type = type(_write_atomic.__code__)
|
|||
# Python 3.12b1 3529 (Inline list/dict/set comprehensions)
|
||||
# Python 3.12b1 3530 (Shrink the LOAD_SUPER_ATTR caches)
|
||||
# Python 3.12b1 3531 (Add PEP 695 changes)
|
||||
# Python 3.13a1 3550 (Plugin optimizer support)
|
||||
|
||||
# Python 3.13 will start with 3550
|
||||
# Python 3.14 will start with 3600
|
||||
|
||||
# Please don't copy-paste the same pre-release tag for new entries above!!!
|
||||
# You should always use the *upcoming* tag. For example, if 3.12a6 came out
|
||||
|
|
@ -461,7 +462,7 @@ _code_type = type(_write_atomic.__code__)
|
|||
# Whenever MAGIC_NUMBER is changed, the ranges in the magic_values array
|
||||
# in PC/launcher.c must also be updated.
|
||||
|
||||
MAGIC_NUMBER = (3531).to_bytes(2, 'little') + b'\r\n'
|
||||
MAGIC_NUMBER = (3550).to_bytes(2, 'little') + b'\r\n'
|
||||
|
||||
_RAW_MAGIC_NUMBER = int.from_bytes(MAGIC_NUMBER, 'little') # For import.c
|
||||
|
||||
|
|
|
|||
|
|
@ -232,6 +232,9 @@ name_op('LOAD_FROM_DICT_OR_GLOBALS', 175)
|
|||
def_op('LOAD_FROM_DICT_OR_DEREF', 176)
|
||||
hasfree.append(176)
|
||||
|
||||
# Optimizer hook
|
||||
def_op('ENTER_EXECUTOR', 230)
|
||||
|
||||
# Instrumented instructions
|
||||
MIN_INSTRUMENTED_OPCODE = 237
|
||||
|
||||
|
|
@ -486,6 +489,9 @@ _cache_format = {
|
|||
"SEND": {
|
||||
"counter": 1,
|
||||
},
|
||||
"JUMP_BACKWARD": {
|
||||
"counter": 1,
|
||||
},
|
||||
}
|
||||
|
||||
_inline_cache_entries = [
|
||||
|
|
|
|||
|
|
@ -1916,6 +1916,19 @@ class Test_Pep523API(unittest.TestCase):
|
|||
names = ["func", "outer", "outer", "inner", "inner", "outer", "inner"]
|
||||
self.do_test(func, names)
|
||||
|
||||
class TestOptimizerAPI(unittest.TestCase):
|
||||
|
||||
def test_counter_optimizer(self):
|
||||
opt = _testinternalcapi.get_counter_optimizer()
|
||||
self.assertEqual(opt.get_count(), 0)
|
||||
try:
|
||||
_testinternalcapi.set_optimizer(opt)
|
||||
self.assertEqual(opt.get_count(), 0)
|
||||
for _ in range(1000):
|
||||
pass
|
||||
self.assertEqual(opt.get_count(), 1000)
|
||||
finally:
|
||||
_testinternalcapi.set_optimizer(None)
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
|
|
|||
|
|
@ -138,10 +138,10 @@ dis_bug708901 = """\
|
|||
|
||||
%3d CALL 2
|
||||
GET_ITER
|
||||
>> FOR_ITER 2 (to 34)
|
||||
>> FOR_ITER 3 (to 36)
|
||||
STORE_FAST 0 (res)
|
||||
|
||||
%3d JUMP_BACKWARD 4 (to 26)
|
||||
%3d JUMP_BACKWARD 5 (to 26)
|
||||
|
||||
%3d >> END_FOR
|
||||
RETURN_CONST 0 (None)
|
||||
|
|
@ -384,7 +384,7 @@ dis_compound_stmt_str = """\
|
|||
BINARY_OP 13 (+=)
|
||||
STORE_NAME 0 (x)
|
||||
|
||||
2 JUMP_BACKWARD 6 (to 8)
|
||||
2 JUMP_BACKWARD 7 (to 8)
|
||||
"""
|
||||
|
||||
dis_traceback = """\
|
||||
|
|
@ -552,20 +552,20 @@ dis_asyncwith = """\
|
|||
RETURN_CONST 0 (None)
|
||||
|
||||
%3d >> CLEANUP_THROW
|
||||
JUMP_BACKWARD 25 (to 24)
|
||||
JUMP_BACKWARD 26 (to 24)
|
||||
>> CLEANUP_THROW
|
||||
JUMP_BACKWARD 9 (to 60)
|
||||
JUMP_BACKWARD 11 (to 60)
|
||||
>> PUSH_EXC_INFO
|
||||
WITH_EXCEPT_START
|
||||
GET_AWAITABLE 2
|
||||
LOAD_CONST 0 (None)
|
||||
>> SEND 4 (to 98)
|
||||
>> SEND 4 (to 102)
|
||||
YIELD_VALUE 3
|
||||
RESUME 3
|
||||
JUMP_BACKWARD_NO_INTERRUPT 5 (to 86)
|
||||
JUMP_BACKWARD_NO_INTERRUPT 5 (to 90)
|
||||
>> CLEANUP_THROW
|
||||
>> END_SEND
|
||||
POP_JUMP_IF_TRUE 1 (to 104)
|
||||
POP_JUMP_IF_TRUE 1 (to 108)
|
||||
RERAISE 2
|
||||
>> POP_TOP
|
||||
POP_EXCEPT
|
||||
|
|
@ -732,7 +732,7 @@ Disassembly of <code object <genexpr> at 0x..., file "%s", line %d>:
|
|||
POP_TOP
|
||||
RESUME 0
|
||||
LOAD_FAST 0 (.0)
|
||||
>> FOR_ITER 9 (to 32)
|
||||
>> FOR_ITER 10 (to 34)
|
||||
STORE_FAST 1 (z)
|
||||
LOAD_DEREF 2 (x)
|
||||
LOAD_FAST 1 (z)
|
||||
|
|
@ -740,7 +740,7 @@ Disassembly of <code object <genexpr> at 0x..., file "%s", line %d>:
|
|||
YIELD_VALUE 1
|
||||
RESUME 1
|
||||
POP_TOP
|
||||
JUMP_BACKWARD 11 (to 10)
|
||||
JUMP_BACKWARD 12 (to 10)
|
||||
>> END_FOR
|
||||
RETURN_CONST 0 (None)
|
||||
>> CALL_INTRINSIC_1 3 (INTRINSIC_STOPITERATION_ERROR)
|
||||
|
|
@ -786,14 +786,14 @@ dis_loop_test_quickened_code = """\
|
|||
LOAD_CONST 2 (3)
|
||||
BINARY_OP 5 (*)
|
||||
GET_ITER
|
||||
>> FOR_ITER_LIST 13 (to 46)
|
||||
>> FOR_ITER_LIST 14 (to 48)
|
||||
STORE_FAST 0 (i)
|
||||
|
||||
%3d LOAD_GLOBAL_MODULE 1 (NULL + load_test)
|
||||
LOAD_FAST 0 (i)
|
||||
CALL_PY_WITH_DEFAULTS 1
|
||||
POP_TOP
|
||||
JUMP_BACKWARD 15 (to 16)
|
||||
JUMP_BACKWARD 16 (to 16)
|
||||
|
||||
%3d >> END_FOR
|
||||
RETURN_CONST 0 (None)
|
||||
|
|
@ -1277,7 +1277,7 @@ class DisTests(DisTestBase):
|
|||
caches = list(self.get_cached_values(quickened, adaptive))
|
||||
for cache in caches:
|
||||
self.assertRegex(cache, pattern)
|
||||
total_caches = 20
|
||||
total_caches = 21
|
||||
empty_caches = 7
|
||||
self.assertEqual(caches.count(""), empty_caches)
|
||||
self.assertEqual(len(caches), total_caches)
|
||||
|
|
@ -1653,13 +1653,14 @@ expected_opinfo_inner = [
|
|||
Instruction(opname='RETURN_CONST', opcode=121, arg=0, argval=None, argrepr='None', offset=36, starts_line=None, is_jump_target=False, positions=None),
|
||||
]
|
||||
|
||||
|
||||
expected_opinfo_jumpy = [
|
||||
Instruction(opname='RESUME', opcode=151, arg=0, argval=0, argrepr='', offset=0, starts_line=1, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=1, argval='range', argrepr='NULL + range', offset=2, starts_line=3, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=1, argval=10, argrepr='10', offset=12, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=14, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='GET_ITER', opcode=68, arg=None, argval=None, argrepr='', offset=22, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='FOR_ITER', opcode=93, arg=26, argval=80, argrepr='to 80', offset=24, starts_line=None, is_jump_target=True, positions=None),
|
||||
Instruction(opname='FOR_ITER', opcode=93, arg=28, argval=84, argrepr='to 84', offset=24, starts_line=None, is_jump_target=True, positions=None),
|
||||
Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=28, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=30, starts_line=4, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=40, starts_line=None, is_jump_target=False, positions=None),
|
||||
|
|
@ -1668,105 +1669,105 @@ expected_opinfo_jumpy = [
|
|||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=52, starts_line=5, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=54, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COMPARE_OP', opcode=107, arg=2, argval='<', argrepr='<', offset=56, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=1, argval=64, argrepr='to 64', offset=60, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=20, argval=24, argrepr='to 24', offset=62, starts_line=6, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=64, starts_line=7, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=66, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COMPARE_OP', opcode=107, arg=68, argval='>', argrepr='>', offset=68, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=1, argval=76, argrepr='to 76', offset=72, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=26, argval=24, argrepr='to 24', offset=74, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=76, starts_line=8, is_jump_target=True, positions=None),
|
||||
Instruction(opname='JUMP_FORWARD', opcode=110, arg=12, argval=104, argrepr='to 104', offset=78, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='END_FOR', opcode=4, arg=None, argval=None, argrepr='', offset=80, starts_line=3, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=82, starts_line=10, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=92, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=94, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=102, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST_CHECK', opcode=127, arg=0, argval='i', argrepr='i', offset=104, starts_line=11, is_jump_target=True, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=31, argval=170, argrepr='to 170', offset=106, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=108, starts_line=12, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=118, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=120, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=128, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=130, starts_line=13, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=132, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='BINARY_OP', opcode=122, arg=23, argval=23, argrepr='-=', offset=134, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=138, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=140, starts_line=14, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=142, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COMPARE_OP', opcode=107, arg=68, argval='>', argrepr='>', offset=144, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=1, argval=152, argrepr='to 152', offset=148, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=24, argval=104, argrepr='to 104', offset=150, starts_line=15, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=152, starts_line=16, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=154, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COMPARE_OP', opcode=107, arg=2, argval='<', argrepr='<', offset=156, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=1, argval=164, argrepr='to 164', offset=160, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_FORWARD', opcode=110, arg=14, argval=192, argrepr='to 192', offset=162, starts_line=17, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=164, starts_line=11, is_jump_target=True, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=2, argval=66, argrepr='to 66', offset=60, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=21, argval=24, argrepr='to 24', offset=62, starts_line=6, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=66, starts_line=7, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=68, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COMPARE_OP', opcode=107, arg=68, argval='>', argrepr='>', offset=70, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=2, argval=80, argrepr='to 80', offset=74, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=28, argval=24, argrepr='to 24', offset=76, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=80, starts_line=8, is_jump_target=True, positions=None),
|
||||
Instruction(opname='JUMP_FORWARD', opcode=110, arg=12, argval=108, argrepr='to 108', offset=82, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='END_FOR', opcode=4, arg=None, argval=None, argrepr='', offset=84, starts_line=3, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=86, starts_line=10, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=4, argval='I can haz else clause?', argrepr="'I can haz else clause?'", offset=96, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=98, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=106, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST_CHECK', opcode=127, arg=0, argval='i', argrepr='i', offset=108, starts_line=11, is_jump_target=True, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=33, argval=178, argrepr='to 178', offset=110, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=112, starts_line=12, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=122, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=124, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=132, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=134, starts_line=13, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=136, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='BINARY_OP', opcode=122, arg=23, argval=23, argrepr='-=', offset=138, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='STORE_FAST', opcode=125, arg=0, argval='i', argrepr='i', offset=142, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=144, starts_line=14, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=3, argval=6, argrepr='6', offset=146, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COMPARE_OP', opcode=107, arg=68, argval='>', argrepr='>', offset=148, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=2, argval=158, argrepr='to 158', offset=152, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=25, argval=108, argrepr='to 108', offset=154, starts_line=15, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=158, starts_line=16, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=2, argval=4, argrepr='4', offset=160, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COMPARE_OP', opcode=107, arg=2, argval='<', argrepr='<', offset=162, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=1, argval=170, argrepr='to 170', offset=166, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=31, argval=108, argrepr='to 108', offset=168, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=170, starts_line=19, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=180, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=182, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=190, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=192, starts_line=20, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=194, starts_line=21, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=196, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='BINARY_OP', opcode=122, arg=11, argval=11, argrepr='/', offset=198, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=202, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=204, starts_line=25, is_jump_target=False, positions=None),
|
||||
Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=206, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=208, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=210, starts_line=26, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Never reach this', argrepr="'Never reach this'", offset=220, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=222, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=230, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=232, starts_line=25, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=234, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=236, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=2, argval=2, argrepr='', offset=238, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=246, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=248, starts_line=28, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=258, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=260, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=268, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RETURN_CONST', opcode=121, arg=0, argval=None, argrepr='None', offset=270, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=272, starts_line=25, is_jump_target=False, positions=None),
|
||||
Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=274, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=1, argval=280, argrepr='to 280', offset=276, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=278, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=280, starts_line=None, is_jump_target=True, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=282, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=284, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=286, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=21, argval=248, argrepr='to 248', offset=288, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=290, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=292, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=294, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=296, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=298, starts_line=22, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CHECK_EXC_MATCH', opcode=36, arg=None, argval=None, argrepr='', offset=308, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=14, argval=340, argrepr='to 340', offset=310, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=312, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=314, starts_line=23, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=324, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=326, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=334, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=336, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=46, argval=248, argrepr='to 248', offset=338, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=340, starts_line=22, is_jump_target=True, positions=None),
|
||||
Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=342, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=344, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=346, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=348, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=350, starts_line=28, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=360, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=362, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=370, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=372, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=374, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=376, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=378, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_FORWARD', opcode=110, arg=15, argval=200, argrepr='to 200', offset=168, starts_line=17, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=170, starts_line=11, is_jump_target=True, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=2, argval=178, argrepr='to 178', offset=172, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=33, argval=112, argrepr='to 112', offset=174, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=178, starts_line=19, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=6, argval='Who let lolcatz into this test suite?', argrepr="'Who let lolcatz into this test suite?'", offset=188, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=190, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=198, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='NOP', opcode=9, arg=None, argval=None, argrepr='', offset=200, starts_line=20, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=5, argval=1, argrepr='1', offset=202, starts_line=21, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=7, argval=0, argrepr='0', offset=204, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='BINARY_OP', opcode=122, arg=11, argval=11, argrepr='/', offset=206, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=210, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_FAST', opcode=124, arg=0, argval='i', argrepr='i', offset=212, starts_line=25, is_jump_target=False, positions=None),
|
||||
Instruction(opname='BEFORE_WITH', opcode=53, arg=None, argval=None, argrepr='', offset=214, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='STORE_FAST', opcode=125, arg=1, argval='dodgy', argrepr='dodgy', offset=216, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=218, starts_line=26, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=8, argval='Never reach this', argrepr="'Never reach this'", offset=228, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=230, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=238, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=240, starts_line=25, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=242, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=0, argval=None, argrepr='None', offset=244, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=2, argval=2, argrepr='', offset=246, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=254, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=256, starts_line=28, is_jump_target=True, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=266, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=268, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=276, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RETURN_CONST', opcode=121, arg=0, argval=None, argrepr='None', offset=278, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=280, starts_line=25, is_jump_target=False, positions=None),
|
||||
Instruction(opname='WITH_EXCEPT_START', opcode=49, arg=None, argval=None, argrepr='', offset=282, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_TRUE', opcode=115, arg=1, argval=288, argrepr='to 288', offset=284, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=2, argval=2, argrepr='', offset=286, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=288, starts_line=None, is_jump_target=True, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=290, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=292, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=294, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=22, argval=256, argrepr='to 256', offset=296, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=300, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=302, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=304, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=306, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=4, argval='ZeroDivisionError', argrepr='ZeroDivisionError', offset=308, starts_line=22, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CHECK_EXC_MATCH', opcode=36, arg=None, argval=None, argrepr='', offset=318, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_JUMP_IF_FALSE', opcode=114, arg=15, argval=352, argrepr='to 352', offset=320, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=322, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=324, starts_line=23, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=9, argval='Here we go, here we go, here we go...', argrepr="'Here we go, here we go, here we go...'", offset=334, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=336, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=344, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=346, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='JUMP_BACKWARD', opcode=140, arg=48, argval=256, argrepr='to 256', offset=348, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=352, starts_line=22, is_jump_target=True, positions=None),
|
||||
Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=354, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=356, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=358, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='PUSH_EXC_INFO', opcode=35, arg=None, argval=None, argrepr='', offset=360, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_GLOBAL', opcode=116, arg=3, argval='print', argrepr='NULL + print', offset=362, starts_line=28, is_jump_target=False, positions=None),
|
||||
Instruction(opname='LOAD_CONST', opcode=100, arg=10, argval="OK, now we're done", argrepr='"OK, now we\'re done"', offset=372, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='CALL', opcode=171, arg=1, argval=1, argrepr='', offset=374, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_TOP', opcode=1, arg=None, argval=None, argrepr='', offset=382, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=0, argval=0, argrepr='', offset=384, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='COPY', opcode=120, arg=3, argval=3, argrepr='', offset=386, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='POP_EXCEPT', opcode=89, arg=None, argval=None, argrepr='', offset=388, starts_line=None, is_jump_target=False, positions=None),
|
||||
Instruction(opname='RERAISE', opcode=119, arg=1, argval=1, argrepr='', offset=390, starts_line=None, is_jump_target=False, positions=None),
|
||||
]
|
||||
|
||||
# One last piece of inspect fodder to check the default line number handling
|
||||
|
|
|
|||
|
|
@ -403,6 +403,7 @@ PYTHON_OBJS= \
|
|||
Python/modsupport.o \
|
||||
Python/mysnprintf.o \
|
||||
Python/mystrtoul.o \
|
||||
Python/optimizer.o \
|
||||
Python/pathconfig.o \
|
||||
Python/preconfig.o \
|
||||
Python/pyarena.o \
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
Add an unstable C API for hooking in an optimizer. This is mainly internal,
|
||||
but marked "unstable" to allow third-party experimentation.
|
||||
|
|
@ -822,6 +822,22 @@ iframe_getlasti(PyObject *self, PyObject *frame)
|
|||
return PyLong_FromLong(PyUnstable_InterpreterFrame_GetLasti(f));
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
get_counter_optimizer(PyObject *self, PyObject *arg)
|
||||
{
|
||||
return PyUnstable_Optimizer_NewCounter();
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
set_optimizer(PyObject *self, PyObject *opt)
|
||||
{
|
||||
if (opt == Py_None) {
|
||||
opt = NULL;
|
||||
}
|
||||
PyUnstable_SetOptimizer((_PyOptimizerObject*)opt);
|
||||
Py_RETURN_NONE;
|
||||
}
|
||||
|
||||
static PyMethodDef module_functions[] = {
|
||||
{"get_configs", get_configs, METH_NOARGS},
|
||||
{"get_recursion_depth", get_recursion_depth, METH_NOARGS},
|
||||
|
|
@ -850,6 +866,8 @@ static PyMethodDef module_functions[] = {
|
|||
{"iframe_getcode", iframe_getcode, METH_O, NULL},
|
||||
{"iframe_getline", iframe_getline, METH_O, NULL},
|
||||
{"iframe_getlasti", iframe_getlasti, METH_O, NULL},
|
||||
{"set_optimizer", set_optimizer, METH_O, NULL},
|
||||
{"get_counter_optimizer", get_counter_optimizer, METH_NOARGS, NULL},
|
||||
{NULL, NULL} /* sentinel */
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -433,6 +433,7 @@ init_code(PyCodeObject *co, struct _PyCodeConstructor *con)
|
|||
co->co_weakreflist = NULL;
|
||||
co->co_extra = NULL;
|
||||
co->_co_cached = NULL;
|
||||
co->co_executors = NULL;
|
||||
|
||||
memcpy(_PyCode_CODE(co), PyBytes_AS_STRING(con->code),
|
||||
PyBytes_GET_SIZE(con->code));
|
||||
|
|
@ -1677,6 +1678,12 @@ code_dealloc(PyCodeObject *co)
|
|||
|
||||
PyMem_Free(co_extra);
|
||||
}
|
||||
if (co->co_executors != NULL) {
|
||||
for (int i = 0; i < co->co_executors->size; i++) {
|
||||
Py_CLEAR(co->co_executors->executors[i]);
|
||||
}
|
||||
PyMem_Free(co->co_executors);
|
||||
}
|
||||
|
||||
Py_XDECREF(co->co_consts);
|
||||
Py_XDECREF(co->co_names);
|
||||
|
|
|
|||
|
|
@ -348,7 +348,7 @@ mark_stacks(PyCodeObject *code_obj, int len)
|
|||
break;
|
||||
case JUMP_BACKWARD:
|
||||
case JUMP_BACKWARD_NO_INTERRUPT:
|
||||
j = i + 1 - oparg;
|
||||
j = next_i - oparg;
|
||||
assert(j >= 0);
|
||||
assert(j < len);
|
||||
if (stacks[j] == UNINITIALIZED && j < i) {
|
||||
|
|
|
|||
|
|
@ -216,6 +216,7 @@
|
|||
<ClCompile Include="..\Python\modsupport.c" />
|
||||
<ClCompile Include="..\Python\mysnprintf.c" />
|
||||
<ClCompile Include="..\Python\mystrtoul.c" />
|
||||
<ClCompile Include="..\Python\optimizer.c" />
|
||||
<ClCompile Include="..\Python\pathconfig.c" />
|
||||
<ClCompile Include="..\Python\perf_trampoline.c" />
|
||||
<ClCompile Include="..\Python\preconfig.c" />
|
||||
|
|
|
|||
|
|
@ -277,6 +277,9 @@
|
|||
<ClCompile Include="..\Objects\odictobject.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Python\optimizer.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Parser\parser.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
|
|
|
|||
|
|
@ -540,6 +540,7 @@
|
|||
<ClCompile Include="..\Python\modsupport.c" />
|
||||
<ClCompile Include="..\Python\mysnprintf.c" />
|
||||
<ClCompile Include="..\Python\mystrtoul.c" />
|
||||
<ClCompile Include="..\Python\optimizer.c" />
|
||||
<ClCompile Include="..\Python\pathconfig.c" />
|
||||
<ClCompile Include="..\Python\perf_trampoline.c" />
|
||||
<ClCompile Include="..\Python\preconfig.c" />
|
||||
|
|
|
|||
|
|
@ -1199,6 +1199,9 @@
|
|||
<ClCompile Include="..\Python\mystrtoul.c">
|
||||
<Filter>Python</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Python\optimizer.c">
|
||||
<Filter>Python</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\Python\pathconfig.c">
|
||||
<Filter>Python</Filter>
|
||||
</ClCompile>
|
||||
|
|
|
|||
|
|
@ -1,38 +1,38 @@
|
|||
// Auto-generated by Programs/freeze_test_frozenmain.py
|
||||
unsigned char M_test_frozenmain[] = {
|
||||
227,0,0,0,0,0,0,0,0,0,0,0,0,8,0,0,
|
||||
0,0,0,0,0,243,162,0,0,0,151,0,100,0,100,1,
|
||||
0,0,0,0,0,243,164,0,0,0,151,0,100,0,100,1,
|
||||
108,0,90,0,100,0,100,1,108,1,90,1,2,0,101,2,
|
||||
100,2,171,1,0,0,0,0,0,0,1,0,2,0,101,2,
|
||||
100,3,101,0,106,6,0,0,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,171,2,0,0,0,0,0,0,
|
||||
1,0,2,0,101,1,106,8,0,0,0,0,0,0,0,0,
|
||||
0,0,0,0,0,0,0,0,0,0,171,0,0,0,0,0,
|
||||
0,0,100,4,25,0,0,0,90,5,100,5,68,0,93,19,
|
||||
0,0,100,4,25,0,0,0,90,5,100,5,68,0,93,20,
|
||||
0,0,90,6,2,0,101,2,100,6,101,6,155,0,100,7,
|
||||
101,5,101,6,25,0,0,0,155,0,157,4,171,1,0,0,
|
||||
0,0,0,0,1,0,140,21,4,0,121,1,41,8,233,0,
|
||||
0,0,0,78,122,18,70,114,111,122,101,110,32,72,101,108,
|
||||
108,111,32,87,111,114,108,100,122,8,115,121,115,46,97,114,
|
||||
103,118,218,6,99,111,110,102,105,103,41,5,218,12,112,114,
|
||||
111,103,114,97,109,95,110,97,109,101,218,10,101,120,101,99,
|
||||
117,116,97,98,108,101,218,15,117,115,101,95,101,110,118,105,
|
||||
114,111,110,109,101,110,116,218,17,99,111,110,102,105,103,117,
|
||||
114,101,95,99,95,115,116,100,105,111,218,14,98,117,102,102,
|
||||
101,114,101,100,95,115,116,100,105,111,122,7,99,111,110,102,
|
||||
105,103,32,122,2,58,32,41,7,218,3,115,121,115,218,17,
|
||||
95,116,101,115,116,105,110,116,101,114,110,97,108,99,97,112,
|
||||
105,218,5,112,114,105,110,116,218,4,97,114,103,118,218,11,
|
||||
103,101,116,95,99,111,110,102,105,103,115,114,3,0,0,0,
|
||||
218,3,107,101,121,169,0,243,0,0,0,0,250,18,116,101,
|
||||
115,116,95,102,114,111,122,101,110,109,97,105,110,46,112,121,
|
||||
250,8,60,109,111,100,117,108,101,62,114,18,0,0,0,1,
|
||||
0,0,0,115,102,0,0,0,240,3,1,1,1,243,8,0,
|
||||
1,11,219,0,24,225,0,5,208,6,26,212,0,27,217,0,
|
||||
5,128,106,144,35,151,40,145,40,212,0,27,216,9,38,208,
|
||||
9,26,215,9,38,209,9,38,211,9,40,168,24,209,9,50,
|
||||
128,6,240,2,6,12,2,242,0,7,1,42,128,67,241,14,
|
||||
0,5,10,136,71,144,67,144,53,152,2,152,54,160,35,153,
|
||||
59,152,45,208,10,40,213,4,41,241,15,7,1,42,114,16,
|
||||
0,0,0,
|
||||
0,0,0,0,1,0,140,22,0,0,4,0,121,1,41,8,
|
||||
233,0,0,0,0,78,122,18,70,114,111,122,101,110,32,72,
|
||||
101,108,108,111,32,87,111,114,108,100,122,8,115,121,115,46,
|
||||
97,114,103,118,218,6,99,111,110,102,105,103,41,5,218,12,
|
||||
112,114,111,103,114,97,109,95,110,97,109,101,218,10,101,120,
|
||||
101,99,117,116,97,98,108,101,218,15,117,115,101,95,101,110,
|
||||
118,105,114,111,110,109,101,110,116,218,17,99,111,110,102,105,
|
||||
103,117,114,101,95,99,95,115,116,100,105,111,218,14,98,117,
|
||||
102,102,101,114,101,100,95,115,116,100,105,111,122,7,99,111,
|
||||
110,102,105,103,32,122,2,58,32,41,7,218,3,115,121,115,
|
||||
218,17,95,116,101,115,116,105,110,116,101,114,110,97,108,99,
|
||||
97,112,105,218,5,112,114,105,110,116,218,4,97,114,103,118,
|
||||
218,11,103,101,116,95,99,111,110,102,105,103,115,114,3,0,
|
||||
0,0,218,3,107,101,121,169,0,243,0,0,0,0,250,18,
|
||||
116,101,115,116,95,102,114,111,122,101,110,109,97,105,110,46,
|
||||
112,121,250,8,60,109,111,100,117,108,101,62,114,18,0,0,
|
||||
0,1,0,0,0,115,102,0,0,0,240,3,1,1,1,243,
|
||||
8,0,1,11,219,0,24,225,0,5,208,6,26,212,0,27,
|
||||
217,0,5,128,106,144,35,151,40,145,40,212,0,27,216,9,
|
||||
38,208,9,26,215,9,38,209,9,38,211,9,40,168,24,209,
|
||||
9,50,128,6,240,2,6,12,2,242,0,7,1,42,128,67,
|
||||
241,14,0,5,10,136,71,144,67,144,53,152,2,152,54,160,
|
||||
35,153,59,152,45,208,10,40,214,4,41,241,15,7,1,42,
|
||||
114,16,0,0,0,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -31,6 +31,7 @@
|
|||
#include "dictobject.h"
|
||||
#include "pycore_frame.h"
|
||||
#include "opcode.h"
|
||||
#include "optimizer.h"
|
||||
#include "pydtrace.h"
|
||||
#include "setobject.h"
|
||||
#include "structmember.h" // struct PyMemberDef, T_OFFSET_EX
|
||||
|
|
@ -2113,11 +2114,36 @@ dummy_func(
|
|||
}
|
||||
|
||||
inst(JUMP_BACKWARD, (--)) {
|
||||
assert(oparg < INSTR_OFFSET());
|
||||
JUMPBY(-oparg);
|
||||
_Py_CODEUNIT *here = next_instr - 1;
|
||||
assert(oparg <= INSTR_OFFSET());
|
||||
JUMPBY(1-oparg);
|
||||
#if ENABLE_SPECIALIZATION
|
||||
here[1].cache += (1 << OPTIMIZER_BITS_IN_COUNTER);
|
||||
if (here[1].cache > tstate->interp->optimizer_backedge_threshold) {
|
||||
OBJECT_STAT_INC(optimization_attempts);
|
||||
frame = _PyOptimizer_BackEdge(frame, here, next_instr, stack_pointer);
|
||||
if (frame == NULL) {
|
||||
frame = cframe.current_frame;
|
||||
goto error;
|
||||
}
|
||||
here[1].cache &= ((1 << OPTIMIZER_BITS_IN_COUNTER) -1);
|
||||
goto resume_frame;
|
||||
}
|
||||
#endif /* ENABLE_SPECIALIZATION */
|
||||
CHECK_EVAL_BREAKER();
|
||||
}
|
||||
|
||||
inst(ENTER_EXECUTOR, (--)) {
|
||||
_PyExecutorObject *executor = (_PyExecutorObject *)frame->f_code->co_executors->executors[oparg];
|
||||
Py_INCREF(executor);
|
||||
frame = executor->execute(executor, frame, stack_pointer);
|
||||
if (frame == NULL) {
|
||||
frame = cframe.current_frame;
|
||||
goto error;
|
||||
}
|
||||
goto resume_frame;
|
||||
}
|
||||
|
||||
inst(POP_JUMP_IF_FALSE, (cond -- )) {
|
||||
if (Py_IsFalse(cond)) {
|
||||
JUMPBY(oparg);
|
||||
|
|
@ -3368,7 +3394,7 @@ dummy_func(
|
|||
}
|
||||
|
||||
inst(INSTRUMENTED_JUMP_BACKWARD, ( -- )) {
|
||||
INSTRUMENTED_JUMP(next_instr-1, next_instr-oparg, PY_MONITORING_EVENT_JUMP);
|
||||
INSTRUMENTED_JUMP(next_instr-1, next_instr+1-oparg, PY_MONITORING_EVENT_JUMP);
|
||||
CHECK_EVAL_BREAKER();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -300,7 +300,6 @@ GETITEM(PyObject *v, Py_ssize_t i) {
|
|||
|
||||
#define INCREMENT_ADAPTIVE_COUNTER(COUNTER) \
|
||||
do { \
|
||||
assert(!ADAPTIVE_COUNTER_IS_MAX((COUNTER))); \
|
||||
(COUNTER) += (1 << ADAPTIVE_BACKOFF_BITS); \
|
||||
} while (0);
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -256,8 +256,8 @@ compute_line(PyCodeObject *code, int offset, int8_t line_delta)
|
|||
return PyCode_Addr2Line(code, offset * sizeof(_Py_CODEUNIT));
|
||||
}
|
||||
|
||||
static int
|
||||
instruction_length(PyCodeObject *code, int offset)
|
||||
int
|
||||
_PyInstruction_GetLength(PyCodeObject *code, int offset)
|
||||
{
|
||||
int opcode = _PyCode_CODE(code)[offset].op.code;
|
||||
assert(opcode != 0);
|
||||
|
|
@ -395,7 +395,7 @@ dump_instrumentation_data(PyCodeObject *code, int star, FILE*out)
|
|||
dump_monitors("Active", data->active_monitors, out);
|
||||
int code_len = (int)Py_SIZE(code);
|
||||
bool starred = false;
|
||||
for (int i = 0; i < code_len; i += instruction_length(code, i)) {
|
||||
for (int i = 0; i < code_len; i += _PyInstruction_GetLength(code, i)) {
|
||||
_Py_CODEUNIT *instr = &_PyCode_CODE(code)[i];
|
||||
int opcode = instr->op.code;
|
||||
if (i == star) {
|
||||
|
|
@ -520,7 +520,7 @@ sanity_check_instrumentation(PyCodeObject *code)
|
|||
CHECK(local_tools == 0xff);
|
||||
}
|
||||
}
|
||||
i += instruction_length(code, i);
|
||||
i += _PyInstruction_GetLength(code, i);
|
||||
assert(i <= code_len);
|
||||
}
|
||||
}
|
||||
|
|
@ -1291,7 +1291,7 @@ initialize_lines(PyCodeObject *code)
|
|||
int opcode = _Py_GetBaseOpcode(code, i);
|
||||
int line = _PyCode_CheckLineNumber(i*(int)sizeof(_Py_CODEUNIT), &range);
|
||||
line_data[i].line_delta = compute_line_delta(code, i, line);
|
||||
int length = instruction_length(code, i);
|
||||
int length = _PyInstruction_GetLength(code, i);
|
||||
switch (opcode) {
|
||||
case END_ASYNC_FOR:
|
||||
case END_FOR:
|
||||
|
|
@ -1332,7 +1332,7 @@ initialize_lines(PyCodeObject *code)
|
|||
opcode = _Py_GetBaseOpcode(code, i);
|
||||
}
|
||||
oparg = (oparg << 8) | _PyCode_CODE(code)[i].op.arg;
|
||||
i += instruction_length(code, i);
|
||||
i += _PyInstruction_GetLength(code, i);
|
||||
int target = -1;
|
||||
switch (opcode) {
|
||||
case POP_JUMP_IF_FALSE:
|
||||
|
|
@ -1504,7 +1504,6 @@ is_super_instruction(uint8_t opcode) {
|
|||
int
|
||||
_Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
|
||||
{
|
||||
|
||||
if (is_version_up_to_date(code, interp)) {
|
||||
assert(
|
||||
interp->monitoring_version == 0 ||
|
||||
|
|
@ -1541,7 +1540,7 @@ _Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
|
|||
return 0;
|
||||
}
|
||||
/* Insert instrumentation */
|
||||
for (int i = 0; i < code_len; i+= instruction_length(code, i)) {
|
||||
for (int i = 0; i < code_len; i+= _PyInstruction_GetLength(code, i)) {
|
||||
_Py_CODEUNIT *instr = &_PyCode_CODE(code)[i];
|
||||
if (is_super_instruction(instr->op.code)) {
|
||||
instr->op.code = _PyOpcode_Deopt[instr->op.code];
|
||||
|
|
@ -1582,20 +1581,20 @@ _Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
|
|||
remove_line_tools(code, i, removed_line_tools);
|
||||
}
|
||||
}
|
||||
i += instruction_length(code, i);
|
||||
i += _PyInstruction_GetLength(code, i);
|
||||
}
|
||||
}
|
||||
if (removed_per_instruction_tools) {
|
||||
for (int i = code->_co_firsttraceable; i < code_len;) {
|
||||
int opcode = _Py_GetBaseOpcode(code, i);
|
||||
if (opcode == RESUME || opcode == END_FOR) {
|
||||
i += instruction_length(code, i);
|
||||
i += _PyInstruction_GetLength(code, i);
|
||||
continue;
|
||||
}
|
||||
if (removed_per_instruction_tools) {
|
||||
remove_per_instruction_tools(code, i, removed_per_instruction_tools);
|
||||
}
|
||||
i += instruction_length(code, i);
|
||||
i += _PyInstruction_GetLength(code, i);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1610,20 +1609,20 @@ _Py_Instrument(PyCodeObject *code, PyInterpreterState *interp)
|
|||
add_line_tools(code, i, new_line_tools);
|
||||
}
|
||||
}
|
||||
i += instruction_length(code, i);
|
||||
i += _PyInstruction_GetLength(code, i);
|
||||
}
|
||||
}
|
||||
if (new_per_instruction_tools) {
|
||||
for (int i = code->_co_firsttraceable; i < code_len;) {
|
||||
int opcode = _Py_GetBaseOpcode(code, i);
|
||||
if (opcode == RESUME || opcode == END_FOR) {
|
||||
i += instruction_length(code, i);
|
||||
i += _PyInstruction_GetLength(code, i);
|
||||
continue;
|
||||
}
|
||||
if (new_per_instruction_tools) {
|
||||
add_per_instruction_tools(code, i, new_per_instruction_tools);
|
||||
}
|
||||
i += instruction_length(code, i);
|
||||
i += _PyInstruction_GetLength(code, i);
|
||||
}
|
||||
}
|
||||
#ifdef INSTRUMENT_DEBUG
|
||||
|
|
|
|||
|
|
@ -265,6 +265,8 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
|
|||
return 0;
|
||||
case JUMP_BACKWARD:
|
||||
return 0;
|
||||
case ENTER_EXECUTOR:
|
||||
return 0;
|
||||
case POP_JUMP_IF_FALSE:
|
||||
return 1;
|
||||
case POP_JUMP_IF_TRUE:
|
||||
|
|
@ -661,6 +663,8 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
|
|||
return 0;
|
||||
case JUMP_BACKWARD:
|
||||
return 0;
|
||||
case ENTER_EXECUTOR:
|
||||
return 0;
|
||||
case POP_JUMP_IF_FALSE:
|
||||
return 0;
|
||||
case POP_JUMP_IF_TRUE:
|
||||
|
|
@ -933,6 +937,7 @@ const struct opcode_metadata _PyOpcode_opcode_metadata[256] = {
|
|||
[IMPORT_FROM] = { true, INSTR_FMT_IB },
|
||||
[JUMP_FORWARD] = { true, INSTR_FMT_IB },
|
||||
[JUMP_BACKWARD] = { true, INSTR_FMT_IB },
|
||||
[ENTER_EXECUTOR] = { true, INSTR_FMT_IB },
|
||||
[POP_JUMP_IF_FALSE] = { true, INSTR_FMT_IB },
|
||||
[POP_JUMP_IF_TRUE] = { true, INSTR_FMT_IB },
|
||||
[POP_JUMP_IF_NOT_NONE] = { true, INSTR_FMT_IB },
|
||||
|
|
|
|||
|
|
@ -229,7 +229,7 @@ static void *opcode_targets[256] = {
|
|||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
&&TARGET_ENTER_EXECUTOR,
|
||||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
|
|
|
|||
|
|
@ -0,0 +1,254 @@
|
|||
|
||||
#include "Python.h"
|
||||
#include "opcode.h"
|
||||
#include "pycore_interp.h"
|
||||
#include "pycore_opcode.h"
|
||||
#include "pycore_pystate.h"
|
||||
#include "cpython/optimizer.h"
|
||||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <stddef.h>
|
||||
|
||||
/* Returns the index of the next space, or -1 if there is no
|
||||
* more space. Doesn't set an exception. */
|
||||
static int32_t
|
||||
get_next_free_in_executor_array(PyCodeObject *code)
|
||||
{
|
||||
_PyExecutorArray *old = code->co_executors;
|
||||
int size = 0;
|
||||
int capacity = 0;
|
||||
if (old != NULL) {
|
||||
size = old->size;
|
||||
capacity = old->capacity;
|
||||
if (capacity >= 256) {
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
assert(size <= capacity);
|
||||
if (size == capacity) {
|
||||
/* Array is full. Grow array */
|
||||
int new_capacity = capacity ? capacity * 2 : 4;
|
||||
_PyExecutorArray *new = PyMem_Realloc(
|
||||
old,
|
||||
offsetof(_PyExecutorArray, executors) +
|
||||
new_capacity * sizeof(_PyExecutorObject *));
|
||||
if (new == NULL) {
|
||||
return -1;
|
||||
}
|
||||
new->capacity = new_capacity;
|
||||
new->size = size;
|
||||
code->co_executors = new;
|
||||
}
|
||||
assert(size < code->co_executors->capacity);
|
||||
code->co_executors->size++;
|
||||
return size;
|
||||
}
|
||||
|
||||
static void
|
||||
insert_executor(PyCodeObject *code, _Py_CODEUNIT *instr, int index, _PyExecutorObject *executor)
|
||||
{
|
||||
if (instr->op.code == ENTER_EXECUTOR) {
|
||||
assert(index == instr->op.arg);
|
||||
_PyExecutorObject *old = code->co_executors->executors[index];
|
||||
executor->vm_data.opcode = old->vm_data.opcode;
|
||||
executor->vm_data.oparg = old->vm_data.oparg;
|
||||
old->vm_data.opcode = 0;
|
||||
Py_INCREF(executor);
|
||||
code->co_executors->executors[index] = executor;
|
||||
Py_DECREF(old);
|
||||
}
|
||||
else {
|
||||
Py_INCREF(executor);
|
||||
executor->vm_data.opcode = instr->op.code;
|
||||
executor->vm_data.oparg = instr->op.arg;
|
||||
code->co_executors->executors[index] = executor;
|
||||
assert(index < 256);
|
||||
instr->op.code = ENTER_EXECUTOR;
|
||||
instr->op.arg = index;
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
static int
|
||||
get_executor_index(PyCodeObject *code, _Py_CODEUNIT *instr)
|
||||
{
|
||||
if (instr->op.code == ENTER_EXECUTOR) {
|
||||
return instr->op.arg;
|
||||
}
|
||||
else {
|
||||
return get_next_free_in_executor_array(code);
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
PyUnstable_Replace_Executor(PyCodeObject *code, _Py_CODEUNIT *instr, _PyExecutorObject *new)
|
||||
{
|
||||
if (instr->op.code != ENTER_EXECUTOR) {
|
||||
PyErr_Format(PyExc_ValueError, "No executor to replace");
|
||||
return -1;
|
||||
}
|
||||
int index = get_executor_index(code, instr);
|
||||
assert(index >= 0);
|
||||
insert_executor(code, instr, index, new);
|
||||
return 0;
|
||||
}
|
||||
|
||||
static _PyExecutorObject *
|
||||
error_optimize(
|
||||
_PyOptimizerObject* self,
|
||||
PyCodeObject *code,
|
||||
_Py_CODEUNIT *instr)
|
||||
{
|
||||
PyErr_Format(PyExc_SystemError, "Should never call error_optimize");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static PyTypeObject DefaultOptimizer_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
.tp_name = "noop_optimizer",
|
||||
.tp_basicsize = sizeof(_PyOptimizerObject),
|
||||
.tp_itemsize = 0,
|
||||
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
|
||||
};
|
||||
|
||||
_PyOptimizerObject _PyOptimizer_Default = {
|
||||
PyObject_HEAD_INIT(&DefaultOptimizer_Type)
|
||||
.optimize = error_optimize,
|
||||
.resume_threshold = UINT16_MAX,
|
||||
.backedge_threshold = UINT16_MAX,
|
||||
};
|
||||
|
||||
_PyOptimizerObject *
|
||||
PyUnstable_GetOptimizer(void)
|
||||
{
|
||||
PyInterpreterState *interp = PyInterpreterState_Get();
|
||||
if (interp->optimizer == &_PyOptimizer_Default) {
|
||||
return NULL;
|
||||
}
|
||||
Py_INCREF(interp->optimizer);
|
||||
return interp->optimizer;
|
||||
}
|
||||
|
||||
void
|
||||
PyUnstable_SetOptimizer(_PyOptimizerObject *optimizer)
|
||||
{
|
||||
PyInterpreterState *interp = PyInterpreterState_Get();
|
||||
if (optimizer == NULL) {
|
||||
optimizer = &_PyOptimizer_Default;
|
||||
}
|
||||
_PyOptimizerObject *old = interp->optimizer;
|
||||
Py_INCREF(optimizer);
|
||||
interp->optimizer = optimizer;
|
||||
interp->optimizer_backedge_threshold = optimizer->backedge_threshold;
|
||||
interp->optimizer_resume_threshold = optimizer->resume_threshold;
|
||||
Py_DECREF(old);
|
||||
}
|
||||
|
||||
_PyInterpreterFrame *
|
||||
_PyOptimizer_BackEdge(_PyInterpreterFrame *frame, _Py_CODEUNIT *src, _Py_CODEUNIT *dest, PyObject **stack_pointer)
|
||||
{
|
||||
PyInterpreterState *interp = PyInterpreterState_Get();
|
||||
int index = get_executor_index(frame->f_code, src);
|
||||
if (index < 0) {
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
return frame;
|
||||
}
|
||||
_PyOptimizerObject *opt = interp->optimizer;
|
||||
_PyExecutorObject *executor = opt->optimize(opt, frame->f_code, dest);
|
||||
if (executor == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
insert_executor(frame->f_code, src, index, executor);
|
||||
return executor->execute(executor, frame, stack_pointer);
|
||||
}
|
||||
|
||||
|
||||
/** Test support **/
|
||||
|
||||
|
||||
typedef struct {
|
||||
_PyOptimizerObject base;
|
||||
int64_t count;
|
||||
} _PyCounterOptimizerObject;
|
||||
|
||||
typedef struct {
|
||||
_PyExecutorObject executor;
|
||||
_PyCounterOptimizerObject *optimizer;
|
||||
_Py_CODEUNIT *next_instr;
|
||||
} _PyCounterExecutorObject;
|
||||
|
||||
static void
|
||||
counter_dealloc(_PyCounterExecutorObject *self) {
|
||||
Py_DECREF(self->optimizer);
|
||||
PyObject_Free(self);
|
||||
}
|
||||
|
||||
static PyTypeObject CounterExecutor_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
.tp_name = "counting_executor",
|
||||
.tp_basicsize = sizeof(_PyCounterExecutorObject),
|
||||
.tp_itemsize = 0,
|
||||
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
|
||||
.tp_dealloc = (destructor)counter_dealloc,
|
||||
};
|
||||
|
||||
static _PyInterpreterFrame *
|
||||
counter_execute(_PyExecutorObject *self, _PyInterpreterFrame *frame, PyObject **stack_pointer)
|
||||
{
|
||||
((_PyCounterExecutorObject *)self)->optimizer->count++;
|
||||
_PyFrame_SetStackPointer(frame, stack_pointer);
|
||||
frame->prev_instr = ((_PyCounterExecutorObject *)self)->next_instr - 1;
|
||||
Py_DECREF(self);
|
||||
return frame;
|
||||
}
|
||||
|
||||
static _PyExecutorObject *
|
||||
counter_optimize(
|
||||
_PyOptimizerObject* self,
|
||||
PyCodeObject *code,
|
||||
_Py_CODEUNIT *instr)
|
||||
{
|
||||
_PyCounterExecutorObject *executor = (_PyCounterExecutorObject *)_PyObject_New(&CounterExecutor_Type);
|
||||
if (executor == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
executor->executor.execute = counter_execute;
|
||||
Py_INCREF(self);
|
||||
executor->optimizer = (_PyCounterOptimizerObject *)self;
|
||||
executor->next_instr = instr;
|
||||
return (_PyExecutorObject *)executor;
|
||||
}
|
||||
|
||||
static PyObject *
|
||||
counter_get_counter(PyObject *self, PyObject *args)
|
||||
{
|
||||
return PyLong_FromLongLong(((_PyCounterOptimizerObject *)self)->count);
|
||||
}
|
||||
|
||||
static PyMethodDef counter_methods[] = {
|
||||
{ "get_count", counter_get_counter, METH_NOARGS, NULL },
|
||||
{ NULL, NULL },
|
||||
};
|
||||
|
||||
static PyTypeObject CounterOptimizer_Type = {
|
||||
PyVarObject_HEAD_INIT(&PyType_Type, 0)
|
||||
.tp_name = "Counter optimizer",
|
||||
.tp_basicsize = sizeof(_PyCounterOptimizerObject),
|
||||
.tp_itemsize = 0,
|
||||
.tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_DISALLOW_INSTANTIATION,
|
||||
.tp_methods = counter_methods,
|
||||
};
|
||||
|
||||
PyObject *
|
||||
PyUnstable_Optimizer_NewCounter(void)
|
||||
{
|
||||
_PyCounterOptimizerObject *opt = (_PyCounterOptimizerObject *)_PyObject_New(&CounterOptimizer_Type);
|
||||
if (opt == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
opt->base.optimize = counter_optimize;
|
||||
opt->base.resume_threshold = UINT16_MAX;
|
||||
opt->base.backedge_threshold = 0;
|
||||
opt->count = 0;
|
||||
return (PyObject *)opt;
|
||||
}
|
||||
|
|
@ -695,6 +695,9 @@ init_interpreter(PyInterpreterState *interp,
|
|||
}
|
||||
interp->sys_profile_initialized = false;
|
||||
interp->sys_trace_initialized = false;
|
||||
interp->optimizer = &_PyOptimizer_Default;
|
||||
interp->optimizer_backedge_threshold = _PyOptimizer_Default.backedge_threshold;
|
||||
interp->optimizer_resume_threshold = _PyOptimizer_Default.backedge_threshold;
|
||||
if (interp != &runtime->_main_interpreter) {
|
||||
/* Fix the self-referential, statically initialized fields. */
|
||||
interp->dtoa = (struct _dtoa_state)_dtoa_state_INIT(interp);
|
||||
|
|
@ -829,6 +832,11 @@ interpreter_clear(PyInterpreterState *interp, PyThreadState *tstate)
|
|||
tstate->_status.cleared = 0;
|
||||
}
|
||||
|
||||
Py_CLEAR(interp->optimizer);
|
||||
interp->optimizer = &_PyOptimizer_Default;
|
||||
interp->optimizer_backedge_threshold = _PyOptimizer_Default.backedge_threshold;
|
||||
interp->optimizer_resume_threshold = _PyOptimizer_Default.backedge_threshold;
|
||||
|
||||
/* It is possible that any of the objects below have a finalizer
|
||||
that runs Python code or otherwise relies on a thread state
|
||||
or even the interpreter state. For now we trust that isn't
|
||||
|
|
|
|||
|
|
@ -356,6 +356,10 @@ Python/sysmodule.c - perf_map_state -
|
|||
Python/sysmodule.c - _PySys_ImplCacheTag -
|
||||
Python/sysmodule.c - _PySys_ImplName -
|
||||
Python/sysmodule.c - whatstrings -
|
||||
Python/optimizer.c - DefaultOptimizer_Type -
|
||||
Python/optimizer.c - CounterExecutor_Type -
|
||||
Python/optimizer.c - CounterOptimizer_Type -
|
||||
Python/optimizer.c - _PyOptimizer_Default -
|
||||
|
||||
##-----------------------
|
||||
## test code
|
||||
|
|
|
|||
|
Can't render this file because it has a wrong number of fields in line 4.
|
Loading…
Reference in New Issue