mirror of
https://github.com/python/cpython.git
synced 2025-07-19 01:05:26 +00:00
GH-94163: Add BINARY_SLICE and STORE_SLICE instructions. (GH-94168)
This commit is contained in:
Mark Shannon
GitHub
parent
33fc3b5e42
commit
c0453a40fa
14 changed files with 339 additions and 161 deletions
|
|
@ -23,6 +23,7 @@
|
|||
#include "pycore_pymem.h" // _PyMem_IsPtrFreed()
|
||||
#include "pycore_pystate.h" // _PyInterpreterState_GET()
|
||||
#include "pycore_range.h" // _PyRangeIterObject
|
||||
#include "pycore_sliceobject.h" // _PyBuildSlice_ConsumeRefs
|
||||
#include "pycore_sysmodule.h" // _PySys_Audit()
|
||||
#include "pycore_tuple.h" // _PyTuple_ITEMS()
|
||||
#include "pycore_emscripten_signal.h" // _Py_CHECK_EMSCRIPTEN_SIGNALS
|
||||
|
|
@ -2139,6 +2140,46 @@ handle_eval_breaker:
|
|||
DISPATCH();
|
||||
}
|
||||
|
||||
TARGET(BINARY_SLICE) {
|
||||
PyObject *stop = POP();
|
||||
PyObject *start = POP();
|
||||
PyObject *container = TOP();
|
||||
|
||||
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
|
||||
if (slice == NULL) {
|
||||
goto error;
|
||||
}
|
||||
PyObject *res = PyObject_GetItem(container, slice);
|
||||
Py_DECREF(slice);
|
||||
if (res == NULL) {
|
||||
goto error;
|
||||
}
|
||||
SET_TOP(res);
|
||||
Py_DECREF(container);
|
||||
DISPATCH();
|
||||
}
|
||||
|
||||
TARGET(STORE_SLICE) {
|
||||
PyObject *stop = POP();
|
||||
PyObject *start = POP();
|
||||
PyObject *container = TOP();
|
||||
PyObject *v = SECOND();
|
||||
|
||||
PyObject *slice = _PyBuildSlice_ConsumeRefs(start, stop);
|
||||
if (slice == NULL) {
|
||||
goto error;
|
||||
}
|
||||
int err = PyObject_SetItem(container, slice, v);
|
||||
Py_DECREF(slice);
|
||||
if (err) {
|
||||
goto error;
|
||||
}
|
||||
STACK_SHRINK(2);
|
||||
Py_DECREF(v);
|
||||
Py_DECREF(container);
|
||||
DISPATCH();
|
||||
}
|
||||
|
||||
TARGET(BINARY_SUBSCR_ADAPTIVE) {
|
||||
_PyBinarySubscrCache *cache = (_PyBinarySubscrCache *)next_instr;
|
||||
if (ADAPTIVE_COUNTER_IS_ZERO(cache)) {
|
||||
|
|
|
|||
|
|
@ -1030,8 +1030,12 @@ stack_effect(int opcode, int oparg, int jump)
|
|||
|
||||
case BINARY_SUBSCR:
|
||||
return -1;
|
||||
case BINARY_SLICE:
|
||||
return -2;
|
||||
case STORE_SUBSCR:
|
||||
return -3;
|
||||
case STORE_SLICE:
|
||||
return -4;
|
||||
case DELETE_SUBSCR:
|
||||
return -2;
|
||||
|
||||
|
|
@ -5864,7 +5868,14 @@ compiler_visit_expr1(struct compiler *c, expr_ty e)
|
|||
}
|
||||
break;
|
||||
case Slice_kind:
|
||||
return compiler_slice(c, e);
|
||||
{
|
||||
int n = compiler_slice(c, e);
|
||||
if (n == 0) {
|
||||
return 0;
|
||||
}
|
||||
ADDOP_I(c, BUILD_SLICE, n);
|
||||
break;
|
||||
}
|
||||
case Name_kind:
|
||||
return compiler_nameop(c, e->v.Name.id, e->v.Name.ctx);
|
||||
/* child nodes of List and Tuple will have expr_context set */
|
||||
|
|
@ -5886,6 +5897,13 @@ compiler_visit_expr(struct compiler *c, expr_ty e)
|
|||
return res;
|
||||
}
|
||||
|
||||
static bool
|
||||
is_two_element_slice(expr_ty s)
|
||||
{
|
||||
return s->kind == Slice_kind &&
|
||||
s->v.Slice.step == NULL;
|
||||
}
|
||||
|
||||
static int
|
||||
compiler_augassign(struct compiler *c, stmt_ty s)
|
||||
{
|
||||
|
|
@ -5906,10 +5924,21 @@ compiler_augassign(struct compiler *c, stmt_ty s)
|
|||
break;
|
||||
case Subscript_kind:
|
||||
VISIT(c, expr, e->v.Subscript.value);
|
||||
VISIT(c, expr, e->v.Subscript.slice);
|
||||
ADDOP_I(c, COPY, 2);
|
||||
ADDOP_I(c, COPY, 2);
|
||||
ADDOP(c, BINARY_SUBSCR);
|
||||
if (is_two_element_slice(e->v.Subscript.slice)) {
|
||||
if (!compiler_slice(c, e->v.Subscript.slice)) {
|
||||
return 0;
|
||||
}
|
||||
ADDOP_I(c, COPY, 3);
|
||||
ADDOP_I(c, COPY, 3);
|
||||
ADDOP_I(c, COPY, 3);
|
||||
ADDOP(c, BINARY_SLICE);
|
||||
}
|
||||
else {
|
||||
VISIT(c, expr, e->v.Subscript.slice);
|
||||
ADDOP_I(c, COPY, 2);
|
||||
ADDOP_I(c, COPY, 2);
|
||||
ADDOP(c, BINARY_SUBSCR);
|
||||
}
|
||||
break;
|
||||
case Name_kind:
|
||||
if (!compiler_nameop(c, e->v.Name.id, Load))
|
||||
|
|
@ -5936,9 +5965,17 @@ compiler_augassign(struct compiler *c, stmt_ty s)
|
|||
ADDOP_NAME(c, STORE_ATTR, e->v.Attribute.attr, names);
|
||||
break;
|
||||
case Subscript_kind:
|
||||
ADDOP_I(c, SWAP, 3);
|
||||
ADDOP_I(c, SWAP, 2);
|
||||
ADDOP(c, STORE_SUBSCR);
|
||||
if (is_two_element_slice(e->v.Subscript.slice)) {
|
||||
ADDOP_I(c, SWAP, 4);
|
||||
ADDOP_I(c, SWAP, 3);
|
||||
ADDOP_I(c, SWAP, 2);
|
||||
ADDOP(c, STORE_SLICE);
|
||||
}
|
||||
else {
|
||||
ADDOP_I(c, SWAP, 3);
|
||||
ADDOP_I(c, SWAP, 2);
|
||||
ADDOP(c, STORE_SUBSCR);
|
||||
}
|
||||
break;
|
||||
case Name_kind:
|
||||
return compiler_nameop(c, e->v.Name.id, Store);
|
||||
|
|
@ -6146,18 +6183,34 @@ compiler_subscript(struct compiler *c, expr_ty e)
|
|||
}
|
||||
}
|
||||
|
||||
switch (ctx) {
|
||||
case Load: op = BINARY_SUBSCR; break;
|
||||
case Store: op = STORE_SUBSCR; break;
|
||||
case Del: op = DELETE_SUBSCR; break;
|
||||
}
|
||||
assert(op);
|
||||
VISIT(c, expr, e->v.Subscript.value);
|
||||
VISIT(c, expr, e->v.Subscript.slice);
|
||||
ADDOP(c, op);
|
||||
if (is_two_element_slice(e->v.Subscript.slice) && ctx != Del) {
|
||||
if (!compiler_slice(c, e->v.Subscript.slice)) {
|
||||
return 0;
|
||||
}
|
||||
if (ctx == Load) {
|
||||
ADDOP(c, BINARY_SLICE);
|
||||
}
|
||||
else {
|
||||
assert(ctx == Store);
|
||||
ADDOP(c, STORE_SLICE);
|
||||
}
|
||||
}
|
||||
else {
|
||||
VISIT(c, expr, e->v.Subscript.slice);
|
||||
switch (ctx) {
|
||||
case Load: op = BINARY_SUBSCR; break;
|
||||
case Store: op = STORE_SUBSCR; break;
|
||||
case Del: op = DELETE_SUBSCR; break;
|
||||
}
|
||||
assert(op);
|
||||
ADDOP(c, op);
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Returns the number of the values emitted,
|
||||
* thus are needed to build the slice, or 0 if there is an error. */
|
||||
static int
|
||||
compiler_slice(struct compiler *c, expr_ty s)
|
||||
{
|
||||
|
|
@ -6183,8 +6236,7 @@ compiler_slice(struct compiler *c, expr_ty s)
|
|||
n++;
|
||||
VISIT(c, expr, s->v.Slice.step);
|
||||
}
|
||||
ADDOP_I(c, BUILD_SLICE, n);
|
||||
return 1;
|
||||
return n;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
52
Python/opcode_targets.h
generated
52
Python/opcode_targets.h
generated
|
|
@ -25,18 +25,20 @@ static void *opcode_targets[256] = {
|
|||
&&TARGET_CALL_PY_EXACT_ARGS,
|
||||
&&TARGET_CALL_PY_WITH_DEFAULTS,
|
||||
&&TARGET_BINARY_SUBSCR,
|
||||
&&TARGET_BINARY_SLICE,
|
||||
&&TARGET_STORE_SLICE,
|
||||
&&TARGET_CALL_BOUND_METHOD_EXACT_ARGS,
|
||||
&&TARGET_CALL_BUILTIN_CLASS,
|
||||
&&TARGET_CALL_BUILTIN_FAST_WITH_KEYWORDS,
|
||||
&&TARGET_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
|
||||
&&TARGET_GET_LEN,
|
||||
&&TARGET_MATCH_MAPPING,
|
||||
&&TARGET_MATCH_SEQUENCE,
|
||||
&&TARGET_MATCH_KEYS,
|
||||
&&TARGET_CALL_NO_KW_BUILTIN_FAST,
|
||||
&&TARGET_CALL_BUILTIN_FAST_WITH_KEYWORDS,
|
||||
&&TARGET_PUSH_EXC_INFO,
|
||||
&&TARGET_CHECK_EXC_MATCH,
|
||||
&&TARGET_CHECK_EG_MATCH,
|
||||
&&TARGET_CALL_METHOD_DESCRIPTOR_FAST_WITH_KEYWORDS,
|
||||
&&TARGET_CALL_NO_KW_BUILTIN_FAST,
|
||||
&&TARGET_CALL_NO_KW_BUILTIN_O,
|
||||
&&TARGET_CALL_NO_KW_ISINSTANCE,
|
||||
&&TARGET_CALL_NO_KW_LEN,
|
||||
|
|
@ -46,46 +48,44 @@ static void *opcode_targets[256] = {
|
|||
&&TARGET_CALL_NO_KW_METHOD_DESCRIPTOR_O,
|
||||
&&TARGET_CALL_NO_KW_STR_1,
|
||||
&&TARGET_CALL_NO_KW_TUPLE_1,
|
||||
&&TARGET_CALL_NO_KW_TYPE_1,
|
||||
&&TARGET_COMPARE_OP_ADAPTIVE,
|
||||
&&TARGET_WITH_EXCEPT_START,
|
||||
&&TARGET_GET_AITER,
|
||||
&&TARGET_GET_ANEXT,
|
||||
&&TARGET_BEFORE_ASYNC_WITH,
|
||||
&&TARGET_BEFORE_WITH,
|
||||
&&TARGET_END_ASYNC_FOR,
|
||||
&&TARGET_CALL_NO_KW_TYPE_1,
|
||||
&&TARGET_COMPARE_OP_ADAPTIVE,
|
||||
&&TARGET_COMPARE_OP_FLOAT_JUMP,
|
||||
&&TARGET_COMPARE_OP_INT_JUMP,
|
||||
&&TARGET_COMPARE_OP_STR_JUMP,
|
||||
&&TARGET_EXTENDED_ARG_QUICK,
|
||||
&&TARGET_FOR_ITER_ADAPTIVE,
|
||||
&&TARGET_STORE_SUBSCR,
|
||||
&&TARGET_DELETE_SUBSCR,
|
||||
&&TARGET_EXTENDED_ARG_QUICK,
|
||||
&&TARGET_FOR_ITER_ADAPTIVE,
|
||||
&&TARGET_FOR_ITER_LIST,
|
||||
&&TARGET_FOR_ITER_RANGE,
|
||||
&&TARGET_JUMP_BACKWARD_QUICK,
|
||||
&&TARGET_LOAD_ATTR_ADAPTIVE,
|
||||
&&TARGET_LOAD_ATTR_CLASS,
|
||||
&&TARGET_LOAD_ATTR_INSTANCE_VALUE,
|
||||
&&TARGET_GET_ITER,
|
||||
&&TARGET_GET_YIELD_FROM_ITER,
|
||||
&&TARGET_PRINT_EXPR,
|
||||
&&TARGET_LOAD_BUILD_CLASS,
|
||||
&&TARGET_LOAD_ATTR_MODULE,
|
||||
&&TARGET_LOAD_ATTR_PROPERTY,
|
||||
&&TARGET_LOAD_ATTR_CLASS,
|
||||
&&TARGET_LOAD_ATTR_INSTANCE_VALUE,
|
||||
&&TARGET_LOAD_ASSERTION_ERROR,
|
||||
&&TARGET_RETURN_GENERATOR,
|
||||
&&TARGET_LOAD_ATTR_MODULE,
|
||||
&&TARGET_LOAD_ATTR_PROPERTY,
|
||||
&&TARGET_LOAD_ATTR_SLOT,
|
||||
&&TARGET_LOAD_ATTR_WITH_HINT,
|
||||
&&TARGET_LOAD_ATTR_METHOD_LAZY_DICT,
|
||||
&&TARGET_LOAD_ATTR_METHOD_NO_DICT,
|
||||
&&TARGET_LOAD_ATTR_METHOD_WITH_DICT,
|
||||
&&TARGET_LOAD_ATTR_METHOD_WITH_VALUES,
|
||||
&&TARGET_LIST_TO_TUPLE,
|
||||
&&TARGET_RETURN_VALUE,
|
||||
&&TARGET_IMPORT_STAR,
|
||||
&&TARGET_SETUP_ANNOTATIONS,
|
||||
&&TARGET_LOAD_CONST__LOAD_FAST,
|
||||
&&TARGET_LOAD_ATTR_METHOD_WITH_DICT,
|
||||
&&TARGET_ASYNC_GEN_WRAP,
|
||||
&&TARGET_PREP_RERAISE_STAR,
|
||||
&&TARGET_POP_EXCEPT,
|
||||
|
|
@ -112,7 +112,7 @@ static void *opcode_targets[256] = {
|
|||
&&TARGET_JUMP_FORWARD,
|
||||
&&TARGET_JUMP_IF_FALSE_OR_POP,
|
||||
&&TARGET_JUMP_IF_TRUE_OR_POP,
|
||||
&&TARGET_LOAD_FAST__LOAD_CONST,
|
||||
&&TARGET_LOAD_ATTR_METHOD_WITH_VALUES,
|
||||
&&TARGET_POP_JUMP_FORWARD_IF_FALSE,
|
||||
&&TARGET_POP_JUMP_FORWARD_IF_TRUE,
|
||||
&&TARGET_LOAD_GLOBAL,
|
||||
|
|
@ -120,7 +120,7 @@ static void *opcode_targets[256] = {
|
|||
&&TARGET_CONTAINS_OP,
|
||||
&&TARGET_RERAISE,
|
||||
&&TARGET_COPY,
|
||||
&&TARGET_LOAD_FAST__LOAD_FAST,
|
||||
&&TARGET_LOAD_CONST__LOAD_FAST,
|
||||
&&TARGET_BINARY_OP,
|
||||
&&TARGET_SEND,
|
||||
&&TARGET_LOAD_FAST,
|
||||
|
|
@ -140,9 +140,9 @@ static void *opcode_targets[256] = {
|
|||
&&TARGET_STORE_DEREF,
|
||||
&&TARGET_DELETE_DEREF,
|
||||
&&TARGET_JUMP_BACKWARD,
|
||||
&&TARGET_LOAD_GLOBAL_ADAPTIVE,
|
||||
&&TARGET_LOAD_FAST__LOAD_CONST,
|
||||
&&TARGET_CALL_FUNCTION_EX,
|
||||
&&TARGET_LOAD_GLOBAL_BUILTIN,
|
||||
&&TARGET_LOAD_FAST__LOAD_FAST,
|
||||
&&TARGET_EXTENDED_ARG,
|
||||
&&TARGET_LIST_APPEND,
|
||||
&&TARGET_SET_ADD,
|
||||
|
|
@ -152,30 +152,32 @@ static void *opcode_targets[256] = {
|
|||
&&TARGET_YIELD_VALUE,
|
||||
&&TARGET_RESUME,
|
||||
&&TARGET_MATCH_CLASS,
|
||||
&&TARGET_LOAD_GLOBAL_MODULE,
|
||||
&&TARGET_RESUME_QUICK,
|
||||
&&TARGET_LOAD_GLOBAL_ADAPTIVE,
|
||||
&&TARGET_LOAD_GLOBAL_BUILTIN,
|
||||
&&TARGET_FORMAT_VALUE,
|
||||
&&TARGET_BUILD_CONST_KEY_MAP,
|
||||
&&TARGET_BUILD_STRING,
|
||||
&&TARGET_LOAD_GLOBAL_MODULE,
|
||||
&&TARGET_RESUME_QUICK,
|
||||
&&TARGET_STORE_ATTR_ADAPTIVE,
|
||||
&&TARGET_STORE_ATTR_INSTANCE_VALUE,
|
||||
&&TARGET_STORE_ATTR_SLOT,
|
||||
&&TARGET_STORE_ATTR_WITH_HINT,
|
||||
&&TARGET_LIST_EXTEND,
|
||||
&&TARGET_SET_UPDATE,
|
||||
&&TARGET_DICT_MERGE,
|
||||
&&TARGET_DICT_UPDATE,
|
||||
&&TARGET_STORE_ATTR_SLOT,
|
||||
&&TARGET_STORE_ATTR_WITH_HINT,
|
||||
&&TARGET_STORE_FAST__LOAD_FAST,
|
||||
&&TARGET_STORE_FAST__STORE_FAST,
|
||||
&&TARGET_STORE_SUBSCR_ADAPTIVE,
|
||||
&&TARGET_STORE_SUBSCR_DICT,
|
||||
&&TARGET_STORE_SUBSCR_LIST_INT,
|
||||
&&TARGET_CALL,
|
||||
&&TARGET_KW_NAMES,
|
||||
&&TARGET_POP_JUMP_BACKWARD_IF_NOT_NONE,
|
||||
&&TARGET_POP_JUMP_BACKWARD_IF_NONE,
|
||||
&&TARGET_POP_JUMP_BACKWARD_IF_FALSE,
|
||||
&&TARGET_POP_JUMP_BACKWARD_IF_TRUE,
|
||||
&&TARGET_STORE_SUBSCR_DICT,
|
||||
&&TARGET_STORE_SUBSCR_LIST_INT,
|
||||
&&TARGET_UNPACK_SEQUENCE_ADAPTIVE,
|
||||
&&TARGET_UNPACK_SEQUENCE_LIST,
|
||||
&&TARGET_UNPACK_SEQUENCE_TUPLE,
|
||||
|
|
@ -252,7 +254,5 @@ static void *opcode_targets[256] = {
|
|||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
&&_unknown_opcode,
|
||||
&&TARGET_DO_TRACING
|
||||
};
|
||||
|
|
|
|||
|
|
@ -140,7 +140,8 @@ print_spec_stats(FILE *out, OpcodeStats *stats)
|
|||
{
|
||||
/* Mark some opcodes as specializable for stats,
|
||||
* even though we don't specialize them yet. */
|
||||
fprintf(out, "opcode[%d].specializable : 1\n", FOR_ITER);
|
||||
fprintf(out, "opcode[%d].specializable : 1\n", BINARY_SLICE);
|
||||
fprintf(out, "opcode[%d].specializable : 1\n", STORE_SLICE);
|
||||
for (int i = 0; i < 256; i++) {
|
||||
if (_PyOpcode_Adaptive[i]) {
|
||||
fprintf(out, "opcode[%d].specializable : 1\n", i);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue