FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

gh-131798: Add `MATCH_SEQUENCE/MAPPING` to the JIT optimizer by Sacul0457 · Pull Request #148124 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

gh-131798: Add MATCH_SEQUENCE/MAPPING to the JIT optimizer #148124

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

Open
Sacul0457 wants to merge 8 commits into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 25 Commits 8 Checks 66 Files changed
Open

gh-131798: Add MATCH_SEQUENCE/MAPPING to the JIT optimizer #148124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
16f6ab0
optimize MATCH_SEQUENCE/MAPPING
Sacul0457 Apr 5, 2026
c366767
add else case to set the type to PyBool_Type
Sacul0457 Apr 5, 2026
a405ca7
address review
Sacul0457 Apr 7, 2026
e167770
address review: use replace op instead
Sacul0457 May 21, 2026
ba91a21
Merge branch 'main' into Optimize-MATCH_SEQUENCE-MAPPING
Sacul0457 May 21, 2026
bd2a9d8
use _LOAD_COMMON_CONSTANT and update tests
Sacul0457 May 21, 2026
e178f70
Merge branch 'main' into Optimize-MATCH_SEQUENCE-MAPPING
kumaraditya303 May 23, 2026
1e25f00
address review: assign res
Sacul0457 May 27, 2026
File filter

Filter by extension

Filter by extension .c  (1) .h  (1) .py  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
34 changes: 33 additions & 1 deletion Lib/test/test_capi/test_opt.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -5710,10 +5710,42 @@ class A:
res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
self.assertEqual(res, TIER2_THRESHOLD)
uops = get_opnames(ex)

self.assertIn("_MATCH_CLASS", uops)
self.assertEqual(count_ops(ex, "_POP_TOP_NOP"), 4)

def test_match_mapping(self):
def testfunc(n):
x = {}
ret = 0
for _ in range(n):
x["a"] = 1
match x:
case {}:
ret += 1
return ret

res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
self.assertEqual(res, TIER2_THRESHOLD)
uops = get_opnames(ex)
self.assertNotIn("_MATCH_MAPPING", uops)
self.assertIn("_LOAD_COMMON_CONSTANT", uops)

def test_match_sequence(self):
def testfunc(n):
ret = 0
for _ in range(n):
x = 1, 2
match x:
case a, b:
ret += 1
return ret

res, ex = self._run_with_optimizer(testfunc, TIER2_THRESHOLD)
self.assertEqual(res, TIER2_THRESHOLD)
uops = get_opnames(ex)
self.assertNotIn("_MATCH_SEQUENCE", uops)
self.assertIn("_LOAD_COMMON_CONSTANT", uops)

def test_dict_update(self):
def testfunc(n):
d = {1: 2, 3: 4}
Expand Down
24 changes: 24 additions & 0 deletions Python/optimizer_bytecodes.c
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2595,6 +2595,30 @@ dummy_func(void) {
n = names;
}

op(_MATCH_MAPPING, (subject -- subject, res)) {
PyTypeObject *type = sym_get_type(subject);
if (type != NULL) {
int match = type->tp_flags & Py_TPFLAGS_MAPPING;

cocolato Apr 7, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

I also wonder if this logic will be broken by abc.register.

Sacul0457 Apr 7, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Hmm I'm not too sure either. I'll try to see if I can find out more

cocolato Apr 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

abc.register will change the tp_flags but don't update the type version, so JIT won't invalid the old trace

cocolato Apr 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

@Fidget-Spinner Do we need call assign_version_tag when use abc.register?

kumaraditya303 Apr 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Why? ABC never changes the actual type flags.

Fidget-Spinner Apr 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

abc.register will change the tp_flags but don't update the type version, so JIT won't invalid the old trace

That sounds like a bug in abc.register. We should fix abc.register as that might affect the specializing interpreter as well.

kumaraditya303 Apr 12, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Oh, I thought it already did invalidation, so yes this is a bug.

Fidget-Spinner Apr 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

@cocolato do you mind opening an issue for abc.register separately please?

cocolato Apr 12, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Sure, i will try to create the issue and solve this :)

Fidget-Spinner Apr 12, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

You don't have to solve it (unless you want to of course), but just opening an issue is fine :). Thank you
REPLACE_OP(this_instr, _LOAD_COMMON_CONSTANT, match? CONSTANT_TRUE : CONSTANT_FALSE, 0);

kumaraditya303 May 23, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

you need to assign to res here as well

Sacul0457 May 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

added, sorry for the wait
res = sym_new_const(ctx, match? Py_True : Py_False);
}
else {
res = sym_new_type(ctx, &PyBool_Type);
}
}

op(_MATCH_SEQUENCE, (subject -- subject, res)) {
PyTypeObject *type = sym_get_type(subject);
if (type != NULL) {
int match = type->tp_flags & Py_TPFLAGS_SEQUENCE;
REPLACE_OP(this_instr, _LOAD_COMMON_CONSTANT, match? CONSTANT_TRUE : CONSTANT_FALSE, 0);

kumaraditya303 May 27, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

In other places, LOAD_CONST_INLINE_BORROW is used which would be faster
res = sym_new_const(ctx, match? Py_True : Py_False);
}
else {
res = sym_new_type(ctx, &PyBool_Type);
}
}

op(_DICT_UPDATE, (dict, unused[oparg - 1], update -- dict, unused[oparg - 1], upd)) {
(void)dict;
upd = update;
Expand Down
24 changes: 22 additions & 2 deletions Python/optimizer_cases.c.h
Show comments
View file
Open in desktop

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

Loading
Back | FazBrowse Home | New Git URL