Visitar URL original
gh-91404: Improve `re` performance by brandtbucher 路 Pull Request #91495 路 python/cpython 路 GitHub
Skip to content

gh-91404: Improve re performance #91495

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brandtbucher merged 10 commits into from
Apr 15, 2022
Merged

gh-91404: Improve re performance #91495

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
89e4e5e
Try out computed gotos in the regex engine
brandtbucher Apr 12, 2022
bc378d8
Reduce indirection
brandtbucher Apr 12, 2022
fa98784
More of that
brandtbucher Apr 12, 2022
48a7f1c
Rearrange some stuff
brandtbucher Apr 12, 2022
6f8a9a0
Whitespace
brandtbucher Apr 12, 2022
03d3194
Generate sre_targets.h
brandtbucher Apr 12, 2022
24fa5a1
Catch up with main
brandtbucher Apr 13, 2022
0d30328
blurb add
brandtbucher Apr 13, 2022
fdcde9f
fixup
brandtbucher Apr 13, 2022
d38743f
What's New
brandtbucher Apr 14, 2022
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
Generate sre_targets.h
  • Loading branch information
@brandtbucher
brandtbucher committed Apr 12, 2022
commit 03d3194c75de50f8352cd1066a45ec6d07809c13
8 changes: 8 additions & 0 deletions Lib/re/_constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,4 +257,12 @@ def dump(f, d, prefix):
f.write("#define SRE_INFO_LITERAL %d\n" % SRE_INFO_LITERAL)
f.write("#define SRE_INFO_CHARSET %d\n" % SRE_INFO_CHARSET)

with open("sre_targets.h", "w") as f:
f.write("// NOTE: This file is generated by Lib/re/_constants.py!\n\n")
f.write(f"static void *sre_targets[{len(OPCODES)}] = {{\n")
for i, item in enumerate(sorted(OPCODES)):
assert i == item
f.write(f" &&TARGET_SRE_OP_{item},\n")
f.write("};\n")

print("done")
4 changes: 1 addition & 3 deletions Modules/_sre/sre_lib.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1537,9 +1537,7 @@ SRE(match)(SRE_STATE* state, const SRE_CODE* pattern, int toplevel)
TRACE(("|%p|%p|FAILURE\n", pattern, ptr));
RETURN_FAILURE;

#if USE_COMPUTED_GOTOS
_unknown:
#else
#if !USE_COMPUTED_GOTOS
default:
#endif
// Also any unused opcodes:
Expand Down
216 changes: 3 additions & 213 deletions Modules/_sre/sre_targets.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
static void *sre_targets[256] = {
// NOTE: This file is generated by Lib/re/_constants.py!

static void *sre_targets[44] = {
&&TARGET_SRE_OP_FAILURE,
&&TARGET_SRE_OP_SUCCESS,
&&TARGET_SRE_OP_ANY,
Expand Down Expand Up @@ -43,216 +45,4 @@ static void *sre_targets[256] = {
&&TARGET_SRE_OP_LITERAL_UNI_IGNORE,
&&TARGET_SRE_OP_NOT_LITERAL_UNI_IGNORE,
&&TARGET_SRE_OP_RANGE_UNI_IGNORE,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
&&_unknown,
};