https://github.com/python/cpython/commit/b5b06349eb71b7cf9e5082e26e6fe0145875f95b
commit: b5b06349eb71b7cf9e5082e26e6fe0145875f95b
branch: main
author: Brandt Bucher <[email protected]>
committer: brandtbucher <[email protected]>
date: 2024-10-28T14:37:16-07:00
summary:
GH-125912: Teach the JIT's optimizer about _BINARY_OP_INPLACE_ADD_UNICODE
(GH-125935)
files:
M Python/optimizer_bytecodes.c
M Python/optimizer_cases.c.h
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index d71b55cbe1c68d..f40ad1e5744fd1 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -331,6 +331,24 @@ dummy_func(void) {
}
}
+ op(_BINARY_OP_INPLACE_ADD_UNICODE, (left, right -- )) {
+ _Py_UopsSymbol *res;
+ if (sym_is_const(left) && sym_is_const(right) &&
+ sym_matches_type(left, &PyUnicode_Type) && sym_matches_type(right,
&PyUnicode_Type)) {
+ PyObject *temp = PyUnicode_Concat(sym_get_const(left),
sym_get_const(right));
+ if (temp == NULL) {
+ goto error;
+ }
+ res = sym_new_const(ctx, temp);
+ Py_DECREF(temp);
+ }
+ else {
+ res = sym_new_type(ctx, &PyUnicode_Type);
+ }
+ // _STORE_FAST:
+ GETLOCAL(this_instr->operand) = res;
+ }
+
op(_BINARY_SUBSCR_INIT_CALL, (container, sub -- new_frame:
_Py_UOpsAbstractFrame *)) {
(void)container;
(void)sub;
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 6ec9e69d1dbc44..243b3efa41b2d0 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -484,6 +484,25 @@
}
case _BINARY_OP_INPLACE_ADD_UNICODE: {
+ _Py_UopsSymbol *right;
+ _Py_UopsSymbol *left;
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ _Py_UopsSymbol *res;
+ if (sym_is_const(left) && sym_is_const(right) &&
+ sym_matches_type(left, &PyUnicode_Type) &&
sym_matches_type(right, &PyUnicode_Type)) {
+ PyObject *temp = PyUnicode_Concat(sym_get_const(left),
sym_get_const(right));
+ if (temp == NULL) {
+ goto error;
+ }
+ res = sym_new_const(ctx, temp);
+ Py_DECREF(temp);
+ }
+ else {
+ res = sym_new_type(ctx, &PyUnicode_Type);
+ }
+ // _STORE_FAST:
+ GETLOCAL(this_instr->operand) = res;
stack_pointer += -2;
assert(WITHIN_STACK_BOUNDS());
break;
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
