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

This commit is contained in:
Brandt Bucher 2025-04-01 15:10:15 -07:00 committed by GitHub
parent cd69d55f64
commit 1a9d4a1fb3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
10 changed files with 756 additions and 703 deletions

View file

@ -104,22 +104,18 @@ dummy_func(void) {
res = sym_new_null(ctx);
}
op(_GUARD_BOTH_INT, (left, right -- left, right)) {
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);
}
op(_GUARD_TOS_INT, (tos -- tos)) {
if (sym_matches_type(tos, &PyLong_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
else {
if (sym_matches_type(right, &PyLong_Type)) {
REPLACE_OP(this_instr, _GUARD_NOS_INT, 0, 0);
}
sym_set_type(tos, &PyLong_Type);
}
op(_GUARD_NOS_INT, (nos, unused -- nos, unused)) {
if (sym_matches_type(nos, &PyLong_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(left, &PyLong_Type);
sym_set_type(right, &PyLong_Type);
sym_set_type(nos, &PyLong_Type);
}
op(_GUARD_TYPE_VERSION, (type_version/2, owner -- owner)) {
@ -145,32 +141,18 @@ dummy_func(void) {
}
}
op(_GUARD_BOTH_FLOAT, (left, right -- left, right)) {
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);
}
op(_GUARD_TOS_FLOAT, (tos -- tos)) {
if (sym_matches_type(tos, &PyFloat_Type)) {
REPLACE_OP(this_instr, _NOP, 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);
sym_set_type(tos, &PyFloat_Type);
}
op(_GUARD_BOTH_UNICODE, (left, right -- left, right)) {
if (sym_matches_type(left, &PyUnicode_Type) &&
sym_matches_type(right, &PyUnicode_Type)) {
REPLACE_OP(this_instr, _NOP, 0 ,0);
op(_GUARD_NOS_FLOAT, (nos, unused -- nos, unused)) {
if (sym_matches_type(nos, &PyFloat_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(left, &PyUnicode_Type);
sym_set_type(right, &PyUnicode_Type);
sym_set_type(nos, &PyFloat_Type);
}
op(_BINARY_OP, (left, right -- res)) {
@ -418,6 +400,13 @@ dummy_func(void) {
}
}
op(_GUARD_NOS_UNICODE, (nos, unused -- nos, unused)) {
if (sym_matches_type(nos, &PyUnicode_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);
}
sym_set_type(nos, &PyUnicode_Type);
}
op(_GUARD_TOS_UNICODE, (value -- value)) {
if (sym_matches_type(value, &PyUnicode_Type)) {
REPLACE_OP(this_instr, _NOP, 0, 0);