https://github.com/python/cpython/commit/4ebf8fbdab1c64041ff0ea54b3d15624f6e01511
commit: 4ebf8fbdab1c64041ff0ea54b3d15624f6e01511
branch: main
author: Ken Jin <[email protected]>
committer: Fidget-Spinner <[email protected]>
date: 2024-02-15T14:02:18+08:00
summary:
gh-115480: Type and constant propagation for int BINARY_OPs (GH-115478)
files:
M Python/optimizer_analysis.c
M Python/tier2_redundancy_eliminator_bytecodes.c
M Python/tier2_redundancy_eliminator_cases.c.h
diff --git a/Python/optimizer_analysis.c b/Python/optimizer_analysis.c
index 49974520de924d..d73bc310345f41 100644
--- a/Python/optimizer_analysis.c
+++ b/Python/optimizer_analysis.c
@@ -341,6 +341,18 @@ sym_new_const(_Py_UOpsAbstractInterpContext *ctx, PyObject
*const_val)
return temp;
}
+static inline bool
+is_const(_Py_UOpsSymType *sym)
+{
+ return sym->const_val != NULL;
+}
+
+static inline PyObject *
+get_const(_Py_UOpsSymType *sym)
+{
+ return sym->const_val;
+}
+
static _Py_UOpsSymType*
sym_new_null(_Py_UOpsAbstractInterpContext *ctx)
{
diff --git a/Python/tier2_redundancy_eliminator_bytecodes.c
b/Python/tier2_redundancy_eliminator_bytecodes.c
index 3272b187f20d0e..39ea0eef627632 100644
--- a/Python/tier2_redundancy_eliminator_bytecodes.c
+++ b/Python/tier2_redundancy_eliminator_bytecodes.c
@@ -81,12 +81,62 @@ dummy_func(void) {
op(_BINARY_OP_ADD_INT, (left, right -- res)) {
- // TODO constant propagation
- (void)left;
- (void)right;
- res = sym_new_known_type(ctx, &PyLong_Type);
- if (res == NULL) {
- goto out_of_space;
+ if (is_const(left) && is_const(right)) {
+ assert(PyLong_CheckExact(get_const(left)));
+ assert(PyLong_CheckExact(get_const(right)));
+ PyObject *temp = _PyLong_Add((PyLongObject *)get_const(left),
+ (PyLongObject *)get_const(right));
+ if (temp == NULL) {
+ goto error;
+ }
+ res = sym_new_const(ctx, temp);
+ // TODO replace opcode with constant propagated one and add tests!
+ }
+ else {
+ res = sym_new_known_type(ctx, &PyLong_Type);
+ if (res == NULL) {
+ goto out_of_space;
+ }
+ }
+ }
+
+ op(_BINARY_OP_SUBTRACT_INT, (left, right -- res)) {
+ if (is_const(left) && is_const(right)) {
+ assert(PyLong_CheckExact(get_const(left)));
+ assert(PyLong_CheckExact(get_const(right)));
+ PyObject *temp = _PyLong_Subtract((PyLongObject *)get_const(left),
+ (PyLongObject
*)get_const(right));
+ if (temp == NULL) {
+ goto error;
+ }
+ res = sym_new_const(ctx, temp);
+ // TODO replace opcode with constant propagated one and add tests!
+ }
+ else {
+ res = sym_new_known_type(ctx, &PyLong_Type);
+ if (res == NULL) {
+ goto out_of_space;
+ }
+ }
+ }
+
+ op(_BINARY_OP_MULTIPLY_INT, (left, right -- res)) {
+ if (is_const(left) && is_const(right)) {
+ assert(PyLong_CheckExact(get_const(left)));
+ assert(PyLong_CheckExact(get_const(right)));
+ PyObject *temp = _PyLong_Multiply((PyLongObject *)get_const(left),
+ (PyLongObject
*)get_const(right));
+ if (temp == NULL) {
+ goto error;
+ }
+ res = sym_new_const(ctx, temp);
+ // TODO replace opcode with constant propagated one and add tests!
+ }
+ else {
+ res = sym_new_known_type(ctx, &PyLong_Type);
+ if (res == NULL) {
+ goto out_of_space;
+ }
}
}
diff --git a/Python/tier2_redundancy_eliminator_cases.c.h
b/Python/tier2_redundancy_eliminator_cases.c.h
index c2b7bbaf1c4481..a9617f51ef4615 100644
--- a/Python/tier2_redundancy_eliminator_cases.c.h
+++ b/Python/tier2_redundancy_eliminator_cases.c.h
@@ -180,9 +180,28 @@
}
case _BINARY_OP_MULTIPLY_INT: {
+ _Py_UOpsSymType *right;
+ _Py_UOpsSymType *left;
_Py_UOpsSymType *res;
- res = sym_new_unknown(ctx);
- if (res == NULL) goto out_of_space;
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ if (is_const(left) && is_const(right)) {
+ assert(PyLong_CheckExact(get_const(left)));
+ assert(PyLong_CheckExact(get_const(right)));
+ PyObject *temp = _PyLong_Multiply((PyLongObject
*)get_const(left),
+ (PyLongObject *)get_const(right));
+ if (temp == NULL) {
+ goto error;
+ }
+ res = sym_new_const(ctx, temp);
+ // TODO replace opcode with constant propagated one and add
tests!
+ }
+ else {
+ res = sym_new_known_type(ctx, &PyLong_Type);
+ if (res == NULL) {
+ goto out_of_space;
+ }
+ }
stack_pointer[-2] = res;
stack_pointer += -1;
break;
@@ -194,12 +213,22 @@
_Py_UOpsSymType *res;
right = stack_pointer[-1];
left = stack_pointer[-2];
- // TODO constant propagation
- (void)left;
- (void)right;
- res = sym_new_known_type(ctx, &PyLong_Type);
- if (res == NULL) {
- goto out_of_space;
+ if (is_const(left) && is_const(right)) {
+ assert(PyLong_CheckExact(get_const(left)));
+ assert(PyLong_CheckExact(get_const(right)));
+ PyObject *temp = _PyLong_Add((PyLongObject *)get_const(left),
+ (PyLongObject *)get_const(right));
+ if (temp == NULL) {
+ goto error;
+ }
+ res = sym_new_const(ctx, temp);
+ // TODO replace opcode with constant propagated one and add
tests!
+ }
+ else {
+ res = sym_new_known_type(ctx, &PyLong_Type);
+ if (res == NULL) {
+ goto out_of_space;
+ }
}
stack_pointer[-2] = res;
stack_pointer += -1;
@@ -207,9 +236,28 @@
}
case _BINARY_OP_SUBTRACT_INT: {
+ _Py_UOpsSymType *right;
+ _Py_UOpsSymType *left;
_Py_UOpsSymType *res;
- res = sym_new_unknown(ctx);
- if (res == NULL) goto out_of_space;
+ right = stack_pointer[-1];
+ left = stack_pointer[-2];
+ if (is_const(left) && is_const(right)) {
+ assert(PyLong_CheckExact(get_const(left)));
+ assert(PyLong_CheckExact(get_const(right)));
+ PyObject *temp = _PyLong_Subtract((PyLongObject
*)get_const(left),
+ (PyLongObject *)get_const(right));
+ if (temp == NULL) {
+ goto error;
+ }
+ res = sym_new_const(ctx, temp);
+ // TODO replace opcode with constant propagated one and add
tests!
+ }
+ else {
+ res = sym_new_known_type(ctx, &PyLong_Type);
+ if (res == NULL) {
+ goto out_of_space;
+ }
+ }
stack_pointer[-2] = res;
stack_pointer += -1;
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]
