8000 gh-104909: Split BINARY_OP into micro-ops by gvanrossum · Pull Request #104910 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-104909: Split BINARY_OP into micro-ops #104910

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
merged 8 commits into from
May 31, 2023
Merged

gh-104909: Split BINARY_OP into micro-ops #104910

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4cac682
Start splitting bytecodes into micro-ops
gvanrossum May 24, 2023
24026a0
Do the remaining BINARY_OP specializations
gvanrossum May 25, 2023
6f7c955
Move unused/1 cache effects to actions
gvanrossum May 25, 2023
fd46248
Use match/case as intended
gvanrossum May 27, 2023
5cd8b66
Roll back changes to BINARY_OP itself
gvanrossum May 30, 2023
17483ad
Rename guard uops
gvanrossum May 30, 2023
74d4eab
Merge remote-tracking branch 'origin/main' into split-ops
gvanrossum May 30, 2023
3259d6e
Fix popped/pushed calculations for macros
gvanrossum May 30, 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
Prev Previous commit
Next Next commit
Rename guard uops
  • Loading branch information
@gvanrossum
gvanrossum committed May 30, 2023
commit 17483ad8f91b83a7b442c7c57dbac77ee1b87ab3
22 changes: 11 additions & 11 deletions Python/bytecodes.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ dummy_func(
// BINARY_OP_INPLACE_ADD_UNICODE, // See comments at that opcode.
};

op(_BINARY_OP_INT_GUARD, (left, right -- left, right)) {
op(_GUARD_BOTH_INT, (left, right -- left, right)) {
DEOPT_IF(!PyLong_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyLong_CheckExact(right), BINARY_OP);
}
Expand Down Expand Up @@ -319,13 +319,13 @@ dummy_func(
}

macro(BINARY_OP_MULTIPLY_INT) =
_BINARY_OP_INT_GUARD + _BINARY_OP_MULTIPLY_INT;
_GUARD_BOTH_INT + _BINARY_OP_MULTIPLY_INT;
macro(BINARY_OP_ADD_INT) =
_BINARY_OP_INT_GUARD + _BINARY_OP_ADD_INT;
_GUARD_BOTH_INT + _BINARY_OP_ADD_INT;
macro(BINARY_OP_SUBTRACT_INT) =
_BINARY_OP_INT_GUARD + _BINARY_OP_SUBTRACT_INT;
_GUARD_BOTH_INT + _BINARY_OP_SUBTRACT_INT;

op(_BINARY_OP_FLOAT_GUARD, (left, right -- left, right)) {
op(_GUARD_BOTH_FLOAT, (left, right -- left, right)) {
DEOPT_IF(!PyFloat_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyFloat_CheckExact(right), BINARY_OP);
}
Expand Down Expand Up @@ -355,13 +355,13 @@ dummy_func(
}

macro(BINARY_OP_MULTIPLY_FLOAT) =
_BINARY_OP_FLOAT_GUARD + _BINARY_OP_MULTIPLY_FLOAT;
_GUARD_BOTH_FLOAT + _BINARY_OP_MULTIPLY_FLOAT;
macro(BINARY_OP_ADD_FLOAT) =
_BINARY_OP_FLOAT_GUARD + _BINARY_OP_ADD_FLOAT;
_GUARD_BOTH_FLOAT + _BINARY_OP_ADD_FLOAT;
macro(BINARY_OP_SUBTRACT_FLOAT) =
_BINARY_OP_FLOAT_GUARD + _BINARY_OP_SUBTRACT_FLOAT;
_GUARD_BOTH_FLOAT + _BINARY_OP_SUBTRACT_FLOAT;

op(_BINARY_OP_UNICODE_GUARD, (left, right -- left, right)) {
op(_GUARD_BOTH_UNICODE, (left, right -- left, right)) {
DEOPT_IF(!PyUnicode_CheckExact(left), BINARY_OP);
DEOPT_IF(!PyUnicode_CheckExact(right), BINARY_OP);
}
Expand All @@ -375,7 +375,7 @@ dummy_func(
}

macro(BINARY_OP_ADD_UNICODE) =
_BINARY_OP_UNICODE_GUARD + _BINARY_OP_ADD_UNICODE;
_GUARD_BOTH_UNICODE + _BINARY_OP_ADD_UNICODE;

// This is a subtle one. It's a super-instruction for
// BINARY_OP_ADD_UNICODE followed by STORE_FAST
Expand Down Expand Up @@ -411,7 +411,7 @@ dummy_func(
}

macro(BINARY_OP_INPLACE_ADD_UNICODE) =
_BINARY_OP_UNICODE_GUARD + _BINARY_OP_INPLACE_ADD_UNICODE;
_GUARD_BOTH_UNICODE + _BINARY_OP_INPLACE_ADD_UNICODE;

family(binary_subscr, INLINE_CACHE_ENTRIES_BINARY_SUBSCR) = {
BINARY_SUBSCR,
Expand Down
0