Skip to content

Perf+Feat: Removed unnecessary declarations in type propagator and type annotated more bytecode #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fidget-Spinner merged 3 commits into from
Mar 3, 2023
Merged

Perf+Feat: Removed unnecessary declarations in type propagator and type annotated more bytecode #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99a4ade
Feat: More type prop rules in the DSL and bytecodes.c
JuliaPoo Mar 2, 2023
d8c6edc
Perf: Removed unneccessary declarations in type propagator
JuliaPoo Mar 3, 2023
24ded88
Perf: Removed unneccessary type annotations in MATCH bytecode
JuliaPoo Mar 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 24 additions & 24 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ dummy_func(
DECREF_INPUTS();
}

inst(PUSH_NULL, (-- res)) {
inst(PUSH_NULL, (-- res: NULL)) {
res = NULL;
}

Expand Down Expand Up @@ -184,7 +184,7 @@ dummy_func(
};


inst(BINARY_OP_MULTIPLY_INT, (unused/1, left, right -- prod)) {
inst(BINARY_OP_MULTIPLY_INT, (unused/1, left, right -- prod: PyLong_Type)) {
assert(cframe.use_tracing == 0);
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
Expand All @@ -195,7 +195,7 @@ dummy_func(
ERROR_IF(prod == NULL, error);
}

inst(BINARY_OP_MULTIPLY_FLOAT, (unused/1, left, right -- prod)) {
inst(BINARY_OP_MULTIPLY_FLOAT, (unused/1, left, right -- prod: PyFloat_Type)) {
assert(cframe.use_tracing == 0);
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
Expand All @@ -208,7 +208,7 @@ dummy_func(
ERROR_IF(prod == NULL, error);
}

inst(BINARY_OP_SUBTRACT_INT, (unused/1, left, right -- sub)) {
inst(BINARY_OP_SUBTRACT_INT, (unused/1, left, right -- sub: PyLong_Type)) {
assert(cframe.use_tracing == 0);
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
Expand All @@ -219,7 +219,7 @@ dummy_func(
ERROR_IF(sub == NULL, error);
}

inst(BINARY_OP_SUBTRACT_FLOAT, (unused/1, left, right -- sub)) {
inst(BINARY_OP_SUBTRACT_FLOAT, (unused/1, left, right -- sub: PyFloat_Type)) {
assert(cframe.use_tracing == 0);
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
Expand All @@ -231,7 +231,7 @@ dummy_func(
ERROR_IF(sub == NULL, error);
}

inst(BINARY_OP_ADD_UNICODE, (unused/1, left, right -- res)) {
inst(BINARY_OP_ADD_UNICODE, (unused/1, left, right -- res: PyUnicode_Type)) {
assert(cframe.use_tracing == 0);
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
Expand Down Expand Up @@ -278,7 +278,7 @@ dummy_func(
JUMPBY(INLINE_CACHE_ENTRIES_BINARY_OP + 1);
}

inst(BINARY_OP_ADD_FLOAT, (unused/1, left, right -- sum)) {
inst(BINARY_OP_ADD_FLOAT, (unused/1, left, right -- sum: PyFloat_Type)) {
assert(cframe.use_tracing == 0);
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
Expand All @@ -291,7 +291,7 @@ dummy_func(
ERROR_IF(sum == NULL, error);
}

macro_inst(BINARY_OP_ADD_INT, (unused/1, left, right -- sum)) {
macro_inst(BINARY_OP_ADD_INT, (unused/1, left, right -- sum: PyLong_Type)) {
assert(cframe.use_tracing == 0);
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(Py_TYPE(right) != Py_TYPE(left), BINARY_OP);
Expand All @@ -303,7 +303,7 @@ dummy_func(
bb_test = PyLong_CheckExact(left) && (Py_TYPE(left) == Py_TYPE(right));
}

u_inst(BINARY_OP_ADD_INT_REST, (left : PyLong_Type, right : PyLong_Type -- sum : PyLong_Type)) {
u_inst(BINARY_OP_ADD_INT_REST, (left, right -- sum : PyLong_Type)) {
STAT_INC(BINARY_OP, hit);
sum = _PyLong_Add((PyLongObject *)left, (PyLongObject *)right);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
Expand Down Expand Up @@ -1274,20 +1274,20 @@ dummy_func(
}
}

inst(BUILD_STRING, (pieces[oparg] -- str)) {
inst(BUILD_STRING, (pieces[oparg] -- str: PyUnicode_Type)) {
str = _PyUnicode_JoinArray(&_Py_STR(empty), pieces, oparg);
for (int i = 0; i < oparg; i++) {
Py_DECREF(pieces[i]);
}
ERROR_IF(str == NULL, error);
}

inst(BUILD_TUPLE, (values[oparg] -- tup)) {
inst(BUILD_TUPLE, (values[oparg] -- tup: PyTuple_Type)) {
tup = _PyTuple_FromArraySteal(values, oparg);
ERROR_IF(tup == NULL, error);
}

inst(BUILD_LIST, (values[oparg] -- list)) {
inst(BUILD_LIST, (values[oparg] -- list: PyList_Type)) {
list = _PyList_FromArraySteal(values, oparg);
ERROR_IF(list == NULL, error);
}
Expand Down Expand Up @@ -1316,7 +1316,7 @@ dummy_func(
ERROR_IF(err < 0, error);
}

inst(BUILD_SET, (values[oparg] -- set)) {
inst(BUILD_SET, (values[oparg] -- set: PySet_Type)) {
set = PySet_New(NULL);
if (set == NULL)
goto error;
Expand All @@ -1333,7 +1333,7 @@ dummy_func(
}
}

inst(BUILD_MAP, (values[oparg*2] -- map)) {
inst(BUILD_MAP, (values[oparg*2] -- map: PyDict_Type)) {
map = _PyDict_FromItems(
values, 2,
values+1, 2,
Expand Down Expand Up @@ -1390,7 +1390,7 @@ dummy_func(
}
}

inst(BUILD_CONST_KEY_MAP, (values[oparg], keys -- map)) {
inst(BUILD_CONST_KEY_MAP, (values[oparg], keys -- map: PyDict_Type)) {
if (!PyTuple_CheckExact(keys) ||
PyTuple_GET_SIZE(keys) != (Py_ssize_t)oparg) {
_PyErr_SetString(tstate, PyExc_SystemError,
Expand Down Expand Up @@ -1835,13 +1835,13 @@ dummy_func(
}
}

inst(IS_OP, (left, right -- b)) {
inst(IS_OP, (left, right -- b: PyBool_Type)) {
int res = Py_Is(left, right) ^ oparg;
DECREF_INPUTS();
b = Py_NewRef(res ? Py_True : Py_False);
}

inst(CONTAINS_OP, (left, right -- b)) {
inst(CONTAINS_OP, (left, right -- b: PyBool_Type)) {
int res = PySequence_Contains(right, left);
DECREF_INPUTS();
ERROR_IF(res < 0, error);
Expand Down Expand Up @@ -1869,7 +1869,7 @@ dummy_func(
}
}

inst(CHECK_EXC_MATCH, (left, right -- left, b)) {
inst(CHECK_EXC_MATCH, (left, right -- left, b: PyBool_Type)) {
assert(PyExceptionInstance_Check(left));
if (check_except_type_valid(tstate, right) < 0) {
DECREF_INPUTS();
Expand Down Expand Up @@ -2155,7 +2155,7 @@ dummy_func(
JUMPBY(-oparg);
}

inst(GET_LEN, (obj -- obj, len_o)) {
inst(GET_LEN, (obj -- obj, len_o: PyLong_Type)) {
// PUSH(len(TOS))
Py_ssize_t len_i = PyObject_Length(obj);
ERROR_IF(len_i < 0, error);
Expand All @@ -2178,13 +2178,13 @@ dummy_func(
}
}

inst(MATCH_MAPPING, (subject -- subject, res)) {
inst(MATCH_MAPPING, (subject -- subject, res: PyBool_Type)) {
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_MAPPING;
res = Py_NewRef(match ? Py_True : Py_False);
PREDICT(POP_JUMP_IF_FALSE);
}

inst(MATCH_SEQUENCE, (subject -- subject, res)) {
inst(MATCH_SEQUENCE, (subject -- subject, res: PyBool_Type)) {
int match = Py_TYPE(subject)->tp_flags & Py_TPFLAGS_SEQUENCE;
res = Py_NewRef(match ? Py_True : Py_False);
PREDICT(POP_JUMP_IF_FALSE);
Expand Down Expand Up @@ -2455,7 +2455,7 @@ dummy_func(
}
}

inst(WITH_EXCEPT_START, (exit_func, lasti, unused, val -- exit_func, lasti, unused, val, res)) {
inst(WITH_EXCEPT_START, (exit_func, lasti, unused, val -- exit_func, lasti: PyLong_Type, unused, val, res)) {
/* At the top of the stack are 4 values:
- val: TOP = exc_info()
- unused: SECOND = previous exception
Expand Down Expand Up @@ -3247,7 +3247,7 @@ dummy_func(
}
}

inst(COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top)) {
inst(COPY, (bottom, unused[oparg-1] -- bottom, unused[oparg-1], top: *bottom)) {
assert(oparg > 0);
top = Py_NewRef(bottom);
}
Expand All @@ -3274,7 +3274,7 @@ dummy_func(
}

inst(SWAP, (bottom, unused[oparg-2], top --
top, unused[oparg-2], bottom)) {
top : *top, unused[oparg-2], bottom : *bottom)) {
assert(oparg >= 2);
}

Expand Down
8 changes: 4 additions & 4 deletions Python/generated_cases.c.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading