Skip to content
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

GH-103906: Remove immortal refcounting in the interpreter #103909

Merged
merged 7 commits into from
May 16, 2023
+476 −516
Merged

GH-103906: Remove immortal refcounting in the interpreter #103909

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1aaf52c
Remove a bunch of refcounting overhead
brandtbucher Apr 26, 2023
446757a
make regen-cases
brandtbucher Apr 26, 2023
138184d
blurb add
brandtbucher Apr 26, 2023
fd95518
fixup
brandtbucher Apr 26, 2023
7f90633
Merge branch 'main' into immortal-interpreter
brandtbucher Apr 29, 2023
733cdb4
Catch up with main
brandtbucher May 16, 2023
56ec571
One more...
brandtbucher May 16, 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
2 changes: 2 additions & 0 deletions Misc/NEWS.d/next/Core and Builtins/2023-04-26-16-26-35.gh-issue-103907.kiONZQ.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Don't modify the refcounts of known immortal objects (:const:`True`,
:const:`False`, and :const:`None`) in the main interpreter loop.
8 changes: 1 addition & 7 deletions Objects/boolobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,7 @@ bool_repr(PyObject *self)

PyObject *PyBool_FromLong(long ok)
{
PyObject *result;

if (ok)
result = Py_True;
else
result = Py_False;
return Py_NewRef(result);
return ok ? Py_True : Py_False;
}

/* We define bool_new to always return either Py_True or Py_False */
Expand Down
44 changes: 13 additions & 31 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ dummy_func(
else {
res = Py_False;
}
Py_INCREF(res);
}

inst(UNARY_INVERT, (value -- res)) {
Expand Down Expand Up @@ -957,7 +956,7 @@ dummy_func(
if (PyErr_GivenExceptionMatches(exc_value, PyExc_StopIteration)) {
value = Py_NewRef(((PyStopIterationObject *)exc_value)->value);
DECREF_INPUTS();
none = Py_NewRef(Py_None);
none = Py_None;
}
else {
_PyErr_SetRaisedException(tstate, Py_NewRef(exc_value));
Expand Down Expand Up @@ -1911,7 +1910,6 @@ dummy_func(
_Py_DECREF_SPECIALIZED(left, _PyFloat_ExactDealloc);
_Py_DECREF_SPECIALIZED(right, _PyFloat_ExactDealloc);
res = (sign_ish & oparg) ? Py_True : Py_False;
Py_INCREF(res);
}

// Similar to COMPARE_OP_FLOAT
Expand All @@ -1930,7 +1928,6 @@ dummy_func(
_Py_DECREF_SPECIALIZED(left, (destructor)PyObject_Free);
_Py_DECREF_SPECIALIZED(right, (destructor)PyObject_Free);
res = (sign_ish & oparg) ? Py_True : Py_False;
Py_INCREF(res);
}

// Similar to COMPARE_OP_FLOAT, but for ==, != only
Expand All @@ -1946,20 +1943,19 @@ dummy_func(
assert((oparg & 0xf) == COMPARISON_NOT_EQUALS || (oparg & 0xf) == COMPARISON_EQUALS);
assert(COMPARISON_NOT_EQUALS + 1 == COMPARISON_EQUALS);
res = ((COMPARISON_NOT_EQUALS + eq) & oparg) ? Py_True : Py_False;
Py_INCREF(res);
}

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

inst(CONTAINS_OP, (left, right -- b)) {
int res = PySequence_Contains(right, left);
DECREF_INPUTS();
ERROR_IF(res < 0, error);
b = Py_NewRef((res^oparg) ? Py_True : Py_False);
b = (res ^ oparg) ? Py_True : Py_False;
}

inst(CHECK_EG_MATCH, (exc_value, match_type -- rest, match)) {
Expand Down Expand Up @@ -1992,7 +1988,7 @@ dummy_func(

int res = PyErr_GivenExceptionMatches(left, right);
DECREF_INPUTS();
b = Py_NewRef(res ? Py_True : Py_False);
b = res ? Py_True : Py_False;
}

inst(IMPORT_NAME, (level, fromlist -- res)) {
Expand All @@ -2019,14 +2015,10 @@ dummy_func(
}

inst(POP_JUMP_IF_FALSE, (cond -- )) {
if (Py_IsTrue(cond)) {
_Py_DECREF_NO_DEALLOC(cond);
}
else if (Py_IsFalse(cond)) {
_Py_DECREF_NO_DEALLOC(cond);
if (Py_IsFalse(cond)) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this cause a performance change, since formerly IsTrue then IsFalse, now IsFalse then IsTrue

Though this comparison is lightweight.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Honestly, I doubt it.

JUMPBY(oparg);
}
else {
else if (!Py_IsTrue(cond)) {
int err = PyObject_IsTrue(cond);
DECREF_INPUTS();
if (err == 0) {
Expand All @@ -2039,14 +2031,10 @@ dummy_func(
}

inst(POP_JUMP_IF_TRUE, (cond -- )) {
if (Py_IsFalse(cond)) {
_Py_DECREF_NO_DEALLOC(cond);
}
else if (Py_IsTrue(cond)) {
_Py_DECREF_NO_DEALLOC(cond);
if (Py_IsTrue(cond)) {
JUMPBY(oparg);
}
else {
else if (!Py_IsFalse(cond)) {
int err = PyObject_IsTrue(cond);
DECREF_INPUTS();
if (err > 0) {
Expand All @@ -2063,14 +2051,10 @@ dummy_func(
DECREF_INPUTS();
JUMPBY(oparg);
}
else {
_Py_DECREF_NO_DEALLOC(value);
}
}

inst(POP_JUMP_IF_NONE, (value -- )) {
if (Py_IsNone(value)) {
_Py_DECREF_NO_DEALLOC(value);
JUMPBY(oparg);
}
else {
Expand Down Expand Up @@ -2106,19 +2090,19 @@ dummy_func(
}
else {
ERROR_IF(_PyErr_Occurred(tstate), error); // Error!
attrs = Py_NewRef(Py_None); // Failure!
attrs = Py_None; // Failure!
}
}

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

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

Expand Down Expand Up @@ -2309,7 +2293,7 @@ dummy_func(
STAT_INC(FOR_ITER, hit);
_PyInterpreterFrame *gen_frame = (_PyInterpreterFrame *)gen->gi_iframe;
frame->return_offset = oparg;
_PyFrame_StackPush(gen_frame, Py_NewRef(Py_None));
_PyFrame_StackPush(gen_frame, Py_None);
gen->gi_frame_state = FRAME_EXECUTING;
gen->gi_exc_state.previous_item = tstate->exc_info;
tstate->exc_info = &gen->gi_exc_state;
Expand Down Expand Up @@ -2416,7 +2400,7 @@ dummy_func(
prev_exc = exc_info->exc_value;
}
else {
prev_exc = Py_NewRef(Py_None);
prev_exc = Py_None;
}
assert(PyExceptionInstance_Check(new_exc));
exc_info->exc_value = Py_NewRef(new_exc);
Expand Down Expand Up @@ -3313,7 +3297,6 @@ dummy_func(
_Py_CODEUNIT *here = next_instr-1;
int offset;
if (Py_IsNone(value)) {
_Py_DECREF_NO_DEALLOC(value);
offset = oparg;
}
else {
Expand All @@ -3328,7 +3311,6 @@ dummy_func(
_Py_CODEUNIT *here = next_instr-1;
int offset;
if (Py_IsNone(value)) {
_Py_DECREF_NO_DEALLOC(value);
offset = 0;
}
else {
Expand Down
Loading