8000 gh-98831: Use opcode metadata for stack_effect() by gvanrossum · Pull Request #101704 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-98831: Use opcode metadata for stack_effect() #101704

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
Feb 9, 2023
Merged

gh-98831: Use opcode metadata for stack_effect() #101704

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f59751d
Write output and metadata in a single run
gvanrossum Feb 8, 2023
383c1fc
Declare or define opcode metadata based on NEED_OPCODE_TABLES
gvanrossum Feb 8, 2023
c5db6bc
Use generated metadata for stack_effect()
gvanrossum Feb 8, 2023
683d8f7
compile.o depends on opcode_metadata.h
gvanrossum Feb 8, 2023
a271ebc
Return -1 for unknown opcode
gvanrossum Feb 8, 2023
977e639
Support jump<0 in stack_effect()
gvanrossum Feb 8, 2023
bd19d79
stack_effect() for specialized opcode is an error
gvanrossum Feb 8, 2023
658ea17
Use MAX_REAL_OPCODE as upper opcode limit
gvanrossum Feb 8, 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
Next Next commit
Write output and metadata in a single run 
This halves the time to run the cases generator
(most of the time goes into parsing the input).
  • Loading branch information
@gvanrossum
gvanrossum committed Feb 8, 2023
commit f59751db0f743c7cd81d15d7880edb56cada0d6f
15 changes: 5 additions & 10 deletions Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1445,22 +1445,17 @@ regen-opcode-targets:

.PHONY: regen-cases
regen-cases:
# Regenerate Python/generated_cases.c.h from Python/bytecodes.c
# Regenerate Python/generated_cases.c.h
# and Python/opcode_metadata.h
# from Python/bytecodes.c
# using Tools/cases_generator/generate_cases.py
PYTHONPATH=$(srcdir)/Tools/cases_generator \
$(PYTHON_FOR_REGEN) \
$(srcdir)/Tools/cases_generator/generate_cases.py \
-i $(srcdir)/Python/bytecodes.c \
-o $(srcdir)/Python/generated_cases.c.h.new
-o $(srcdir)/Python/generated_cases.c.h.new \
-m $(srcdir)/Python/opcode_metadata.h.new
$(UPDATE_FILE) $(srcdir)/Python/generated_cases.c.h $(srcdir)/Python/generated_cases.c.h.new
# Regenerate Python/opcode_metadata.h from Python/bytecodes.c
# using Tools/cases_generator/generate_cases.py --metadata
PYTHONPATH=$(srcdir)/Tools/cases_generator \
$(PYTHON_FOR_REGEN) \
$(srcdir)/Tools/cases_generator/generate_cases.py \
--metadata \
-i $(srcdir)/Python/bytecodes.c \
-o $(srcdir)/Python/opcode_metadata.h.new
$(UPDATE_FILE) $(srcdir)/Python/opcode_metadata.h $(srcdir)/Python/opcode_metadata.h.new

Python/ceval.o: \
Expand Down
22 changes: 8 additions & 14 deletions Tools/cases_generator/generate_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,7 @@
"-o", "--output", type=str, help="Generated code", default=DEFAULT_OUTPUT
)
arg_parser.add_argument(
"-m",
"--metadata",
action="store_true",
help=f"Generate metadata instead, changes output default to {DEFAULT_METADATA_OUTPUT}",
"-m", "--metadata", type=str, help="Generated metadata", default=DEFAULT_METADATA_OUTPUT
)


Expand Down Expand Up @@ -498,13 +495,15 @@ class Analyzer:

filename: str
output_filename: str
metadata_filename: str
src: str
errors: int = 0

def __init__(self, filename: str, output_filename: str):
def __init__(self, filename: str, output_filename: str, metadata_filename: str):
"""Read the input file."""
self.filename = filename
self.output_filename = output_filename
self.metadata_filename = metadata_filename
with open(filename) as f:
self.src = f.read()

Expand Down Expand Up @@ -924,7 +923,7 @@ def write_metadata(self) -> None:
# Turn it into a list of enum definitions.
format_enums = [INSTR_FMT_PREFIX + format for format in sorted(all_formats)]

with open(self.output_filename, "w") as f:
with open(self.metadata_filename, "w") as f:
# Write provenance header
f.write(f"// This file is generated by {THIS} --metadata\n")
f.write(f"// from {os.path.relpath(self.filename, ROOT)}\n")
Expand Down Expand Up @@ -1184,18 +1183,13 @@ def variable_used(node: parser.Node, name: str) -> bool:
def main():
6FF7 """Parse command line, parse input, analyze, write output."""
args = arg_parser.parse_args() # Prints message and sys.exit(2) on error
if args.metadata:
if args.output == DEFAULT_OUTPUT:
args.output = DEFAULT_METADATA_OUTPUT
a = Analyzer(args.input, args.output) # Raises OSError if input unreadable
a = Analyzer(args.input, args.output, args.metadata) # Raises OSError if input unreadable
a.parse() # Raises SyntaxError on failure
a.analyze() # Prints messages and sets a.errors on failure
if a.errors:
sys.exit(f"Found {a.errors} errors")
if args.metadata:
a.write_metadata()
else:
a.write_instructions() # Raises OSError if output can't be written
a.write_instructions() # Raises OSError if output can't be written
a.write_metadata()


if __name__ == "__main__":
Expand Down
0