greg/cpython
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

GH-131798: Allow the JIT to remove more int/float/str guards (GH-131800)

Browse Source
This commit is contained in:
Brandt Bucher
2025-04-01 15:10:15 -07:00
committed by GitHub
parent cd69d55f64
commit 1a9d4a1fb3
10 changed files with 756 additions and 703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

94
Python/optimizer_cases.c.h generated
View File

@@ -217,6 +217,16 @@
break;
}
case _GUARD_NOS_UNICODE: {
JitOptSymbol *nos;
nos = stack_pointer[-2];
if (sym_matches_type(nos, &PyUnicode_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyUnicode_Type);
break;
}
case _GUARD_TOS_UNICODE: {
JitOptSymbol *value;
value = stack_pointer[-1];
@@ -252,34 +262,23 @@
break;
}
case _GUARD_BOTH_INT: {
JitOptSymbol *right;
JitOptSymbol *left;
right = stack_pointer[-1];
left = stack_pointer[-2];
if (sym_matches_type(left, &PyLong_Type)) {
if (sym_matches_type(right, &PyLong_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
else {
REPLACE_OP(this_instr, _GUARD_TOS_INT, 0, 0);
}
}
else {
if (sym_matches_type(right, &PyLong_Type)) {
REPLACE_OP(this_instr, _GUARD_NOS_INT, 0, 0);
}
}
sym_set_type(left, &PyLong_Type);
sym_set_type(right, &PyLong_Type);
break;
}
case _GUARD_NOS_INT: {
JitOptSymbol *nos;
nos = stack_pointer[-2];
if (sym_matches_type(nos, &PyLong_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyLong_Type);
break;
}
case _GUARD_TOS_INT: {
JitOptSymbol *tos;
tos = stack_pointer[-1];
if (sym_matches_type(tos, &PyLong_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(tos, &PyLong_Type);
break;
}
@@ -376,34 +375,23 @@
break;
}
case _GUARD_BOTH_FLOAT: {
JitOptSymbol *right;
JitOptSymbol *left;
right = stack_pointer[-1];
left = stack_pointer[-2];
if (sym_matches_type(left, &PyFloat_Type)) {
if (sym_matches_type(right, &PyFloat_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
else {
REPLACE_OP(this_instr, _GUARD_TOS_FLOAT, 0, 0);
}
}
else {
if (sym_matches_type(right, &PyFloat_Type)) {
REPLACE_OP(this_instr, _GUARD_NOS_FLOAT, 0, 0);
}
}
sym_set_type(left, &PyFloat_Type);
sym_set_type(right, &PyFloat_Type);
break;
}
case _GUARD_NOS_FLOAT: {
JitOptSymbol *nos;
nos = stack_pointer[-2];
if (sym_matches_type(nos, &PyFloat_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyFloat_Type);
break;
}
case _GUARD_TOS_FLOAT: {
JitOptSymbol *tos;
tos = stack_pointer[-1];
if (sym_matches_type(tos, &PyFloat_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(tos, &PyFloat_Type);
break;
}
@@ -503,20 +491,6 @@
break;
}
case _GUARD_BOTH_UNICODE: {
JitOptSymbol *right;
JitOptSymbol *left;
right = stack_pointer[-1];
left = stack_pointer[-2];
if (sym_matches_type(left, &PyUnicode_Type) &&
sym_matches_type(right, &PyUnicode_Type)) {
REPLACE_OP(this_instr, _NOP, 0 ,0);
}
sym_set_type(left, &PyUnicode_Type);
sym_set_type(right, &PyUnicode_Type);
break;
}
case _BINARY_OP_ADD_UNICODE: {
JitOptSymbol *right;
JitOptSymbol *left;