https://github.com/python/cpython/commit/b84a763dca412e8dbbc9cf7c6273c11d6c2220a7
commit: b84a763dca412e8dbbc9cf7c6273c11d6c2220a7
branch: main
author: Ken Jin <[email protected]>
committer: Fidget-Spinner <[email protected]>
date: 2024-10-03T01:10:51+08:00
summary:
gh-120619: Optimize through `_Py_FRAME_GENERAL` (GH-124518)
* Optimize through _Py_FRAME_GENERAL
* refactor
files:
M Python/optimizer_analysis.c
M Python/optimizer_bytecodes.c
M Python/optimizer_cases.c.h
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
index f30e873605d858..06826ff942a761 100644
--- a/Python/optimizer_analysis.c
+++ b/Python/optimizer_analysis.c
@@ -385,6 +385,30 @@ get_code(_PyUOpInstruction *op)
return co;
}
+static PyCodeObject *
+get_code_with_logging(_PyUOpInstruction *op)
+{
+ PyCodeObject *co = NULL;
+ uint64_t push_operand = op->operand;
+ if (push_operand & 1) {
+ co = (PyCodeObject *)(push_operand & ~1);
+ DPRINTF(3, "code=%p ", co);
+ assert(PyCode_Check(co));
+ }
+ else {
+ PyFunctionObject *func = (PyFunctionObject *)push_operand;
+ DPRINTF(3, "func=%p ", func);
+ if (func == NULL) {
+ DPRINTF(3, "\n");
+ DPRINTF(1, "Missing function\n");
+ return NULL;
+ }
+ co = (PyCodeObject *)func->func_code;
+ DPRINTF(3, "code=%p ", co);
+ }
+ return co;
+}
+
/* 1 for success, 0 for not ready, cannot error at the moment. */
static int
optimize_uops(
diff --git a/Python/optimizer_bytecodes.c b/Python/optimizer_bytecodes.c
index 9a1b9da52f4bb5..bf8f0753f800c0 100644
--- a/Python/optimizer_bytecodes.c
+++ b/Python/optimizer_bytecodes.c
@@ -575,25 +575,13 @@ dummy_func(void) {
PyCodeObject *co = NULL;
assert((this_instr + 2)->opcode == _PUSH_FRAME);
- uint64_t push_operand = (this_instr + 2)->operand;
- if (push_operand & 1) {
- co = (PyCodeObject *)(push_operand & ~1);
- DPRINTF(3, "code=%p ", co);
- assert(PyCode_Check(co));
- }
- else {
- PyFunctionObject *func = (PyFunctionObject *)push_operand;
- DPRINTF(3, "func=%p ", func);
- if (func == NULL) {
- DPRINTF(3, "\n");
- DPRINTF(1, "Missing function\n");
- ctx->done = true;
- break;
- }
- co = (PyCodeObject *)func->func_code;
- DPRINTF(3, "code=%p ", co);
+ co = get_code_with_logging((this_instr + 2));
+ if (co == NULL) {
+ ctx->done = true;
+ break;
}
+
assert(self_or_null != NULL);
assert(args != NULL);
if (sym_is_not_null(self_or_null)) {
@@ -619,12 +607,17 @@ dummy_func(void) {
}
op(_PY_FRAME_GENERAL, (callable, self_or_null, args[oparg] -- new_frame:
_Py_UOpsAbstractFrame *)) {
- /* The _Py_UOpsAbstractFrame design assumes that we can copy arguments
across directly */
- (void)callable;
- (void)self_or_null;
- (void)args;
- new_frame = NULL;
- ctx->done = true;
+ (void)(self_or_null);
+ (void)(callable);
+ PyCodeObject *co = NULL;
+ assert((this_instr + 2)->opcode == _PUSH_FRAME);
+ co = get_code_with_logging((this_instr + 2));
+ if (co == NULL) {
+ ctx->done = true;
+ break;
+ }
+
+ new_frame = frame_new(ctx, co, 0, NULL, 0);
}
op(_PY_FRAME_KW, (callable, self_or_null, args[oparg], kwnames --
new_frame: _Py_UOpsAbstractFrame *)) {
diff --git a/Python/optimizer_cases.c.h b/Python/optimizer_cases.c.h
index 4d172e3c762704..fc0c0eff01d4c1 100644
--- a/Python/optimizer_cases.c.h
+++ b/Python/optimizer_cases.c.h
@@ -1663,15 +1663,18 @@
_Py_UopsSymbol *self_or_null;
_Py_UopsSymbol *callable;
_Py_UOpsAbstractFrame *new_frame;
- args = &stack_pointer[-oparg];
self_or_null = stack_pointer[-1 - oparg];
callable = stack_pointer[-2 - oparg];
- /* The _Py_UOpsAbstractFrame design assumes that we can copy
arguments across directly */
- (void)callable;
- (void)self_or_null;
- (void)args;
- new_frame = NULL;
- ctx->done = true;
+ (void)(self_or_null);
+ (void)(callable);
+ PyCodeObject *co = NULL;
+ assert((this_instr + 2)->opcode == _PUSH_FRAME);
+ co = get_code_with_logging((this_instr + 2));
+ if (co == NULL) {
+ ctx->done = true;
+ break;
+ }
+ new_frame = frame_new(ctx, co, 0, NULL, 0);
stack_pointer[-2 - oparg] = (_Py_UopsSymbol *)new_frame;
stack_pointer += -1 - oparg;
assert(WITHIN_STACK_BOUNDS());
@@ -1771,23 +1774,10 @@
(void)callable;
PyCodeObject *co = NULL;
assert((this_instr + 2)->opcode == _PUSH_FRAME);
- uint64_t push_operand = (this_instr + 2)->operand;
- if (push_operand & 1) {
- co = (PyCodeObject *)(push_operand & ~1);
- DPRINTF(3, "code=%p ", co);
- assert(PyCode_Check(co));
- }
- else {
- PyFunctionObject *func = (PyFunctionObject *)push_operand;
- DPRINTF(3, "func=%p ", func);
- if (func == NULL) {
- DPRINTF(3, "\n");
- DPRINTF(1, "Missing function\n");
- ctx->done = true;
- break;
- }
- co = (PyCodeObject *)func->func_code;
- DPRINTF(3, "code=%p ", co);
+ co = get_code_with_logging((this_instr + 2));
+ if (co == NULL) {
+ ctx->done = true;
+ break;
}
assert(self_or_null != NULL);
assert(args != NULL);
_______________________________________________
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]
