mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

gh-98831: rewrite UNPACK_EX, UNPACK_SEQUENCE, UNPACK_SEQUENCE_TWO_TUPLE in the instruction definition DSL (#101641)

Browse source
This commit is contained in:
Irit Katriel 2023-02-07 20:37:43 +00:00 • committed by GitHub
parent f87f6e2396
commit dec1ab0387
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Python/bytecodes.c
View file

@ -859,13 +859,11 @@ dummy_func(
} }
} }
// stack effect: (__0 -- __array[oparg]) inst(UNPACK_SEQUENCE, (unused/1, seq -- unused[oparg])) {
inst(UNPACK_SEQUENCE) {
#if ENABLE_SPECIALIZATION #if ENABLE_SPECIALIZATION
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr; _PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
assert(cframe.use_tracing == 0); assert(cframe.use_tracing == 0);
PyObject *seq = TOP();
next_instr--; next_instr--;
_Py_Specialize_UnpackSequence(seq, next_instr, oparg); _Py_Specialize_UnpackSequence(seq, next_instr, oparg);
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -873,27 +871,19 @@ dummy_func(
STAT_INC(UNPACK_SEQUENCE, deferred); STAT_INC(UNPACK_SEQUENCE, deferred);
DECREMENT_ADAPTIVE_COUNTER(cache->counter); DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */ #endif /* ENABLE_SPECIALIZATION */
PyObject *seq = POP(); PyObject **top = stack_pointer + oparg - 1;
PyObject **top = stack_pointer + oparg; int res = unpack_iterable(tstate, seq, oparg, -1, top);
if (!unpack_iterable(tstate, seq, oparg, -1, top)) {
Py_DECREF(seq);
goto error;
}
STACK_GROW(oparg);
Py_DECREF(seq); Py_DECREF(seq);
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE); ERROR_IF(res == 0, error);
} }
// stack effect: (__0 -- __array[oparg]) inst(UNPACK_SEQUENCE_TWO_TUPLE, (unused/1, seq -- v1, v0)) {
inst(UNPACK_SEQUENCE_TWO_TUPLE) {
PyObject *seq = TOP();
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE); DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE); DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit); STAT_INC(UNPACK_SEQUENCE, hit);
SET_TOP(Py_NewRef(PyTuple_GET_ITEM(seq, 1))); v1 = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
PUSH(Py_NewRef(PyTuple_GET_ITEM(seq, 0))); v0 = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
Py_DECREF(seq); Py_DECREF(seq);
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE);
} }
// stack effect: (__0 -- __array[oparg]) // stack effect: (__0 -- __array[oparg])
@ -926,17 +916,12 @@ dummy_func(
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE); JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE);
} }
// error: UNPACK_EX has irregular stack effect inst(UNPACK_EX, (seq -- unused[oparg & 0xFF], unused, unused[oparg >> 8])) {
inst(UNPACK_EX) {
int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8); int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
PyObject *seq = POP(); PyObject **top = stack_pointer + totalargs - 1;
PyObject **top = stack_pointer + totalargs; int res = unpack_iterable(tstate, seq, oparg & 0xFF, oparg >> 8, top);
if (!unpack_iterable(tstate, seq, oparg & 0xFF, oparg >> 8, top)) {
Py_DECREF(seq);
goto error;
}
STACK_GROW(totalargs);
Py_DECREF(seq); Py_DECREF(seq);
ERROR_IF(res == 0, error);
} }
family(store_attr, INLINE_CACHE_ENTRIES_STORE_ATTR) = { family(store_attr, INLINE_CACHE_ENTRIES_STORE_ATTR) = {

41
Python/generated_cases.c.h generated
View file

@ -1108,11 +1108,11 @@
TARGET(UNPACK_SEQUENCE) { TARGET(UNPACK_SEQUENCE) {
PREDICTED(UNPACK_SEQUENCE); PREDICTED(UNPACK_SEQUENCE);
PyObject *seq = PEEK(1);
#if ENABLE_SPECIALIZATION #if ENABLE_SPECIALIZATION
_PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr; _PyUnpackSequenceCache *cache = (_PyUnpackSequenceCache *)next_instr;
if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) { if (ADAPTIVE_COUNTER_IS_ZERO(cache->counter)) {
assert(cframe.use_tracing == 0); assert(cframe.use_tracing == 0);
PyObject *seq = TOP();
next_instr--; next_instr--;
_Py_Specialize_UnpackSequence(seq, next_instr, oparg); _Py_Specialize_UnpackSequence(seq, next_instr, oparg);
DISPATCH_SAME_OPARG(); DISPATCH_SAME_OPARG();
@ -1120,27 +1120,30 @@
STAT_INC(UNPACK_SEQUENCE, deferred); STAT_INC(UNPACK_SEQUENCE, deferred);
DECREMENT_ADAPTIVE_COUNTER(cache->counter); DECREMENT_ADAPTIVE_COUNTER(cache->counter);
#endif /* ENABLE_SPECIALIZATION */ #endif /* ENABLE_SPECIALIZATION */
PyObject *seq = POP(); PyObject **top = stack_pointer + oparg - 1;
PyObject **top = stack_pointer + oparg; int res = unpack_iterable(tstate, seq, oparg, -1, top);
if (!unpack_iterable(tstate, seq, oparg, -1, top)) {
Py_DECREF(seq);
goto error;
}
STACK_GROW(oparg);
Py_DECREF(seq); Py_DECREF(seq);
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE); if (res == 0) goto pop_1_error;
STACK_SHRINK(1);
STACK_GROW(oparg);
JUMPBY(1);
DISPATCH(); DISPATCH();
} }
TARGET(UNPACK_SEQUENCE_TWO_TUPLE) { TARGET(UNPACK_SEQUENCE_TWO_TUPLE) {
PyObject *seq = TOP(); PyObject *seq = PEEK(1);
PyObject *v1;
PyObject *v0;
DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE); DEOPT_IF(!PyTuple_CheckExact(seq), UNPACK_SEQUENCE);
DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE); DEOPT_IF(PyTuple_GET_SIZE(seq) != 2, UNPACK_SEQUENCE);
STAT_INC(UNPACK_SEQUENCE, hit); STAT_INC(UNPACK_SEQUENCE, hit);
SET_TOP(Py_NewRef(PyTuple_GET_ITEM(seq, 1))); v1 = Py_NewRef(PyTuple_GET_ITEM(seq, 1));
PUSH(Py_NewRef(PyTuple_GET_ITEM(seq, 0))); v0 = Py_NewRef(PyTuple_GET_ITEM(seq, 0));
Py_DECREF(seq); Py_DECREF(seq);
JUMPBY(INLINE_CACHE_ENTRIES_UNPACK_SEQUENCE); STACK_GROW(1);
POKE(1, v0);
POKE(2, v1);
JUMPBY(1);
DISPATCH(); DISPATCH();
} }
@ -1175,15 +1178,13 @@
} }
TARGET(UNPACK_EX) { TARGET(UNPACK_EX) {
PyObject *seq = PEEK(1);
int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8); int totalargs = 1 + (oparg & 0xFF) + (oparg >> 8);
PyObject *seq = POP(); PyObject **top = stack_pointer + totalargs - 1;
PyObject **top = stack_pointer + totalargs; int res = unpack_iterable(tstate, seq, oparg & 0xFF, oparg >> 8, top);
if (!unpack_iterable(tstate, seq, oparg & 0xFF, oparg >> 8, top)) {
Py_DECREF(seq);
goto error;
}
STACK_GROW(totalargs);
Py_DECREF(seq); Py_DECREF(seq);
if (res == 0) goto pop_1_error;
STACK_GROW((oparg & 0xFF) + (oparg >> 8));
DISPATCH(); DISPATCH();
} }

16
Python/opcode_metadata.h
View file

@ -121,15 +121,15 @@ _PyOpcode_num_popped(int opcode, int oparg, bool jump) {
case DELETE_NAME: case DELETE_NAME:
return 0; return 0;
case UNPACK_SEQUENCE: case UNPACK_SEQUENCE:
return -1; return 1;
case UNPACK_SEQUENCE_TWO_TUPLE: case UNPACK_SEQUENCE_TWO_TUPLE:
return -1; return 1;
case UNPACK_SEQUENCE_TUPLE: case UNPACK_SEQUENCE_TUPLE:
return -1; return -1;
case UNPACK_SEQUENCE_LIST: case UNPACK_SEQUENCE_LIST:
return -1; return -1;
case UNPACK_EX: case UNPACK_EX:
return -1; return 1;
case STORE_ATTR: case STORE_ATTR:
return 2; return 2;
case DELETE_ATTR: case DELETE_ATTR:
@ -467,15 +467,15 @@ _PyOpcode_num_pushed(int opcode, int oparg, bool jump) {
case DELETE_NAME: case DELETE_NAME:
return 0; return 0;
case UNPACK_SEQUENCE: case UNPACK_SEQUENCE:
return -1; return oparg;
case UNPACK_SEQUENCE_TWO_TUPLE: case UNPACK_SEQUENCE_TWO_TUPLE:
return -1; return 2;
case UNPACK_SEQUENCE_TUPLE: case UNPACK_SEQUENCE_TUPLE:
return -1; return -1;
case UNPACK_SEQUENCE_LIST: case UNPACK_SEQUENCE_LIST:
return -1; return -1;
case UNPACK_EX: case UNPACK_EX:
return -1; return (oparg & 0xFF) + (oparg >> 8) + 1;
case STORE_ATTR: case STORE_ATTR:
return 0; return 0;
case DELETE_ATTR: case DELETE_ATTR:
@ -759,8 +759,8 @@ struct opcode_metadata {
[LOAD_BUILD_CLASS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX }, [LOAD_BUILD_CLASS] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX },
[STORE_NAME] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, [STORE_NAME] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
[DELETE_NAME] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, [DELETE_NAME] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
[UNPACK_SEQUENCE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, [UNPACK_SEQUENCE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IBC },
[UNPACK_SEQUENCE_TWO_TUPLE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IX }, [UNPACK_SEQUENCE_TWO_TUPLE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IXC },
[UNPACK_SEQUENCE_TUPLE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, [UNPACK_SEQUENCE_TUPLE] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
[UNPACK_SEQUENCE_LIST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, [UNPACK_SEQUENCE_LIST] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },
[UNPACK_EX] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB }, [UNPACK_EX] = { DIR_NONE, DIR_NONE, DIR_NONE, true, INSTR_FMT_IB },