| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | """Generate the main interpreter switch.
 | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | Reads the instruction definitions from bytecodes.c. | 
					
						
							|  |  |  | Writes the cases to generated_cases.c.h, which is #included in ceval.c. | 
					
						
							|  |  |  | """
 | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | import argparse | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | import contextlib | 
					
						
							|  |  |  | import dataclasses | 
					
						
							| 
									
										
										
										
											2022-11-04 17:40:43 -07:00
										 |  |  | import os | 
					
						
							| 
									
										
										
										
											2022-11-04 15:30:17 -07:00
										 |  |  | import re | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | import sys | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | import typing | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | import parser | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  | from parser import StackEffect | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | DEFAULT_INPUT = os.path.relpath( | 
					
						
							|  |  |  |     os.path.join(os.path.dirname(__file__), "../../Python/bytecodes.c") | 
					
						
							|  |  |  | ) | 
					
						
							|  |  |  | DEFAULT_OUTPUT = os.path.relpath( | 
					
						
							|  |  |  |     os.path.join(os.path.dirname(__file__), "../../Python/generated_cases.c.h") | 
					
						
							|  |  |  | ) | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  | DEFAULT_METADATA_OUTPUT = os.path.relpath( | 
					
						
							|  |  |  |     os.path.join(os.path.dirname(__file__), "../../Python/opcode_metadata.h") | 
					
						
							|  |  |  | ) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | BEGIN_MARKER = "// BEGIN BYTECODES //" | 
					
						
							|  |  |  | END_MARKER = "// END BYTECODES //" | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  | RE_PREDICTED = r"^\s*(?:PREDICT\(|GO_TO_INSTRUCTION\(|DEOPT_IF\(.*?,\s*)(\w+)\);\s*$" | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | UNUSED = "unused" | 
					
						
							|  |  |  | BITS_PER_CODE_UNIT = 16 | 
					
						
							| 
									
										
										
										
											2022-11-09 10:50:09 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | arg_parser = argparse.ArgumentParser( | 
					
						
							|  |  |  |     description="Generate the code for the interpreter switch.", | 
					
						
							|  |  |  |     formatter_class=argparse.ArgumentDefaultsHelpFormatter, | 
					
						
							|  |  |  | ) | 
					
						
							|  |  |  | arg_parser.add_argument( | 
					
						
							|  |  |  |     "-i", "--input", type=str, help="Instruction definitions", default=DEFAULT_INPUT | 
					
						
							|  |  |  | ) | 
					
						
							|  |  |  | arg_parser.add_argument( | 
					
						
							|  |  |  |     "-o", "--output", type=str, help="Generated code", default=DEFAULT_OUTPUT | 
					
						
							|  |  |  | ) | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  | arg_parser.add_argument( | 
					
						
							|  |  |  |     "-m", | 
					
						
							|  |  |  |     "--metadata", | 
					
						
							|  |  |  |     action="store_true", | 
					
						
							|  |  |  |     help=f"Generate metadata instead, changes output default to {DEFAULT_METADATA_OUTPUT}", | 
					
						
							|  |  |  | ) | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | class Formatter: | 
					
						
							|  |  |  |     """Wraps an output stream with the ability to indent etc.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     stream: typing.TextIO | 
					
						
							|  |  |  |     prefix: str | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def __init__(self, stream: typing.TextIO, indent: int) -> None: | 
					
						
							|  |  |  |         self.stream = stream | 
					
						
							|  |  |  |         self.prefix = " " * indent | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def write_raw(self, s: str) -> None: | 
					
						
							|  |  |  |         self.stream.write(s) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def emit(self, arg: str) -> None: | 
					
						
							|  |  |  |         if arg: | 
					
						
							|  |  |  |             self.write_raw(f"{self.prefix}{arg}\n") | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             self.write_raw("\n") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     @contextlib.contextmanager | 
					
						
							|  |  |  |     def indent(self): | 
					
						
							|  |  |  |         self.prefix += "    " | 
					
						
							|  |  |  |         yield | 
					
						
							|  |  |  |         self.prefix = self.prefix[:-4] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     @contextlib.contextmanager | 
					
						
							|  |  |  |     def block(self, head: str): | 
					
						
							|  |  |  |         if head: | 
					
						
							|  |  |  |             self.emit(head + " {") | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             self.emit("{") | 
					
						
							|  |  |  |         with self.indent(): | 
					
						
							|  |  |  |             yield | 
					
						
							|  |  |  |         self.emit("}") | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |     def stack_adjust(self, diff: int): | 
					
						
							|  |  |  |         if diff > 0: | 
					
						
							|  |  |  |             self.emit(f"STACK_GROW({diff});") | 
					
						
							|  |  |  |         elif diff < 0: | 
					
						
							|  |  |  |             self.emit(f"STACK_SHRINK({-diff});") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def declare(self, dst: StackEffect, src: StackEffect | None): | 
					
						
							|  |  |  |         if dst.name == UNUSED: | 
					
						
							|  |  |  |             return | 
					
						
							|  |  |  |         typ = f"{dst.type} " if dst.type else "PyObject *" | 
					
						
							|  |  |  |         init = "" | 
					
						
							|  |  |  |         if src: | 
					
						
							|  |  |  |             cast = self.cast(dst, src) | 
					
						
							|  |  |  |             init = f" = {cast}{src.name}" | 
					
						
							|  |  |  |         self.emit(f"{typ}{dst.name}{init};") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def assign(self, dst: StackEffect, src: StackEffect): | 
					
						
							|  |  |  |         if src.name == UNUSED: | 
					
						
							|  |  |  |             return | 
					
						
							|  |  |  |         cast = self.cast(dst, src) | 
					
						
							|  |  |  |         if m := re.match(r"^PEEK\((\d+)\)$", dst.name): | 
					
						
							|  |  |  |             self.emit(f"POKE({m.group(1)}, {cast}{src.name});") | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         elif m := re.match(r"^REG\(oparg(\d+)\)$", dst.name): | 
					
						
							|  |  |  |             self.emit(f"Py_XSETREF({dst.name}, {cast}{src.name});") | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |         else: | 
					
						
							|  |  |  |             self.emit(f"{dst.name} = {cast}{src.name};") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def cast(self, dst: StackEffect, src: StackEffect) -> str: | 
					
						
							|  |  |  |         return f"({dst.type or 'PyObject *'})" if src.type != dst.type else "" | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | @dataclasses.dataclass | 
					
						
							|  |  |  | class Instruction: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     """An instruction with additional data and code.""" | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     # Parts of the underlying instruction definition | 
					
						
							|  |  |  |     inst: parser.InstDef | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |     register: bool | 
					
						
							|  |  |  |     kind: typing.Literal["inst", "op", "legacy"]  # Legacy means no (input -- output) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     name: str | 
					
						
							|  |  |  |     block: parser.Block | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |     block_text: list[str]  # Block.text, less curlies, less PREDICT() calls | 
					
						
							|  |  |  |     predictions: list[str]  # Prediction targets (instruction names) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     # Computed by constructor | 
					
						
							|  |  |  |     always_exits: bool | 
					
						
							|  |  |  |     cache_offset: int | 
					
						
							|  |  |  |     cache_effects: list[parser.CacheEffect] | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |     input_effects: list[StackEffect] | 
					
						
							|  |  |  |     output_effects: list[StackEffect] | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |     unmoved_names: frozenset[str] | 
					
						
							|  |  |  |     instr_fmt: str | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # Parallel to input_effects; set later | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |     input_registers: list[str] = dataclasses.field(repr=False) | 
					
						
							|  |  |  |     output_registers: list[str] = dataclasses.field(repr=False) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |     # Set later | 
					
						
							|  |  |  |     family: parser.Family | None = None | 
					
						
							|  |  |  |     predicted: bool = False | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def __init__(self, inst: parser.InstDef): | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         self.inst = inst | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         self.register = inst.register | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         self.kind = inst.kind | 
					
						
							|  |  |  |         self.name = inst.name | 
					
						
							|  |  |  |         self.block = inst.block | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |         self.block_text, self.predictions = extract_block_text(self.block) | 
					
						
							|  |  |  |         self.always_exits = always_exits(self.block_text) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         self.cache_effects = [ | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |             effect for effect in inst.inputs if isinstance(effect, parser.CacheEffect) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         ] | 
					
						
							|  |  |  |         self.cache_offset = sum(c.size for c in self.cache_effects) | 
					
						
							|  |  |  |         self.input_effects = [ | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |             effect for effect in inst.inputs if isinstance(effect, StackEffect) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         ] | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         self.output_effects = inst.outputs  # For consistency/completeness | 
					
						
							| 
									
										
										
										
											2022-12-27 17:11:03 -08:00
										 |  |  |         unmoved_names: set[str] = set() | 
					
						
							|  |  |  |         for ieffect, oeffect in zip(self.input_effects, self.output_effects): | 
					
						
							|  |  |  |             if ieffect.name == oeffect.name: | 
					
						
							|  |  |  |                 unmoved_names.add(ieffect.name) | 
					
						
							|  |  |  |             else: | 
					
						
							|  |  |  |                 break | 
					
						
							|  |  |  |         self.unmoved_names = frozenset(unmoved_names) | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |         if self.register: | 
					
						
							| 
									
										
										
										
											2023-01-13 17:06:45 -08:00
										 |  |  |             num_regs = len(self.input_effects) + len(self.output_effects) | 
					
						
							|  |  |  |             num_dummies = (num_regs // 2) * 2 + 1 - num_regs | 
					
						
							|  |  |  |             fmt = "I" + "B"*num_regs + "X"*num_dummies | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |         else: | 
					
						
							| 
									
										
										
										
											2023-01-13 17:06:45 -08:00
										 |  |  |             if variable_used(inst.block, "oparg"): | 
					
						
							|  |  |  |                 fmt = "IB" | 
					
						
							|  |  |  |             else: | 
					
						
							|  |  |  |                 fmt = "IX" | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |         cache = "C" | 
					
						
							|  |  |  |         for ce in self.cache_effects: | 
					
						
							|  |  |  |             for _ in range(ce.size): | 
					
						
							|  |  |  |                 fmt += cache | 
					
						
							|  |  |  |                 cache = "0" | 
					
						
							|  |  |  |         self.instr_fmt = fmt | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |     def analyze_registers(self, a: "Analyzer") -> None: | 
					
						
							|  |  |  |         regs = iter(("REG(oparg1)", "REG(oparg2)", "REG(oparg3)")) | 
					
						
							|  |  |  |         try: | 
					
						
							|  |  |  |             self.input_registers = [ | 
					
						
							|  |  |  |                 next(regs) for ieff in self.input_effects if ieff.name != UNUSED | 
					
						
							|  |  |  |             ] | 
					
						
							|  |  |  |             self.output_registers = [ | 
					
						
							|  |  |  |                 next(regs) for oeff in self.output_effects if oeff.name != UNUSED | 
					
						
							|  |  |  |             ] | 
					
						
							|  |  |  |         except StopIteration:  # Running out of registers | 
					
						
							|  |  |  |             a.error( | 
					
						
							|  |  |  |                 f"Instruction {self.name} has too many register effects", node=self.inst | 
					
						
							|  |  |  |             ) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def write(self, out: Formatter) -> None: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         """Write one instruction, sans prologue and epilogue.""" | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         # Write a static assertion that a family's cache size is correct | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         if family := self.family: | 
					
						
							|  |  |  |             if self.name == family.members[0]: | 
					
						
							|  |  |  |                 if cache_size := family.size: | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                     out.emit( | 
					
						
							|  |  |  |                         f"static_assert({cache_size} == " | 
					
						
							|  |  |  |                         f'{self.cache_offset}, "incorrect cache size");' | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                     ) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         if not self.register: | 
					
						
							|  |  |  |             # Write input stack effect variable declarations and initializations | 
					
						
							|  |  |  |             for i, ieffect in enumerate(reversed(self.input_effects), 1): | 
					
						
							|  |  |  |                 src = StackEffect(f"PEEK({i})", "") | 
					
						
							|  |  |  |                 out.declare(ieffect, src) | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             # Write input register variable declarations and initializations | 
					
						
							|  |  |  |             for ieffect, reg in zip(self.input_effects, self.input_registers): | 
					
						
							|  |  |  |                 src = StackEffect(reg, "") | 
					
						
							|  |  |  |                 out.declare(ieffect, src) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |         # Write output stack effect variable declarations | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |         input_names = {ieffect.name for ieffect in self.input_effects} | 
					
						
							|  |  |  |         for oeffect in self.output_effects: | 
					
						
							|  |  |  |             if oeffect.name not in input_names: | 
					
						
							|  |  |  |                 out.declare(oeffect, None) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         # out.emit(f"JUMPBY(OPSIZE({self.inst.name}) - 1);") | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         self.write_body(out, 0) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |         # Skip the rest if the block always exits | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |         if self.always_exits: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |             return | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         if not self.register: | 
					
						
							|  |  |  |             # Write net stack growth/shrinkage | 
					
						
							|  |  |  |             diff = len(self.output_effects) - len(self.input_effects) | 
					
						
							|  |  |  |             out.stack_adjust(diff) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |             # Write output stack effect assignments | 
					
						
							|  |  |  |             for i, oeffect in enumerate(reversed(self.output_effects), 1): | 
					
						
							|  |  |  |                 if oeffect.name not in self.unmoved_names: | 
					
						
							|  |  |  |                     dst = StackEffect(f"PEEK({i})", "") | 
					
						
							|  |  |  |                     out.assign(dst, oeffect) | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             # Write output register assignments | 
					
						
							|  |  |  |             for oeffect, reg in zip(self.output_effects, self.output_registers): | 
					
						
							|  |  |  |                 dst = StackEffect(reg, "") | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                 out.assign(dst, oeffect) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |         # Write cache effect | 
					
						
							|  |  |  |         if self.cache_offset: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |             out.emit(f"JUMPBY({self.cache_offset});") | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def write_body(self, out: Formatter, dedent: int, cache_adjust: int = 0) -> None: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         """Write the instruction body.""" | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         # Write cache effect variable declarations and initializations | 
					
						
							|  |  |  |         cache_offset = cache_adjust | 
					
						
							|  |  |  |         for ceffect in self.cache_effects: | 
					
						
							|  |  |  |             if ceffect.name != UNUSED: | 
					
						
							|  |  |  |                 bits = ceffect.size * BITS_PER_CODE_UNIT | 
					
						
							|  |  |  |                 if bits == 64: | 
					
						
							|  |  |  |                     # NOTE: We assume that 64-bit data in the cache | 
					
						
							|  |  |  |                     # is always an object pointer. | 
					
						
							|  |  |  |                     # If this becomes false, we need a way to specify | 
					
						
							|  |  |  |                     # syntactically what type the cache data is. | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                     typ = "PyObject *" | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                     func = "read_obj" | 
					
						
							|  |  |  |                 else: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                     typ = f"uint{bits}_t " | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                     func = f"read_u{bits}" | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |                 out.emit( | 
					
						
							|  |  |  |                     f"{typ}{ceffect.name} = {func}(&next_instr[{cache_offset}].cache);" | 
					
						
							|  |  |  |                 ) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |             cache_offset += ceffect.size | 
					
						
							|  |  |  |         assert cache_offset == self.cache_offset + cache_adjust | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-16 20:45:55 -08:00
										 |  |  |         # Write the body, substituting a goto for ERROR_IF() and other stuff | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |         assert dedent <= 0 | 
					
						
							|  |  |  |         extra = " " * -dedent | 
					
						
							|  |  |  |         for line in self.block_text: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |             if m := re.match(r"(\s*)ERROR_IF\((.+), (\w+)\);\s*$", line): | 
					
						
							|  |  |  |                 space, cond, label = m.groups() | 
					
						
							|  |  |  |                 # ERROR_IF() must pop the inputs from the stack. | 
					
						
							|  |  |  |                 # The code block is responsible for DECREF()ing them. | 
					
						
							|  |  |  |                 # NOTE: If the label doesn't exist, just add it to ceval.c. | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |                 if not self.register: | 
					
						
							|  |  |  |                     ninputs = len(self.input_effects) | 
					
						
							|  |  |  |                     # Don't pop common input/output effects at the bottom! | 
					
						
							|  |  |  |                     # These aren't DECREF'ed so they can stay. | 
					
						
							|  |  |  |                     for ieff, oeff in zip(self.input_effects, self.output_effects): | 
					
						
							|  |  |  |                         if ieff.name == oeff.name: | 
					
						
							|  |  |  |                             ninputs -= 1 | 
					
						
							|  |  |  |                         else: | 
					
						
							|  |  |  |                             break | 
					
						
							|  |  |  |                 else: | 
					
						
							|  |  |  |                     ninputs = 0 | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                 if ninputs: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                     out.write_raw( | 
					
						
							|  |  |  |                         f"{extra}{space}if ({cond}) goto pop_{ninputs}_{label};\n" | 
					
						
							|  |  |  |                     ) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                 else: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                     out.write_raw(f"{extra}{space}if ({cond}) goto {label};\n") | 
					
						
							| 
									
										
										
										
											2022-12-16 20:45:55 -08:00
										 |  |  |             elif m := re.match(r"(\s*)DECREF_INPUTS\(\);\s*$", line): | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |                 if not self.register: | 
					
						
							|  |  |  |                     space = m.group(1) | 
					
						
							|  |  |  |                     for ieff in self.input_effects: | 
					
						
							|  |  |  |                         if ieff.name not in self.unmoved_names: | 
					
						
							|  |  |  |                             out.write_raw(f"{extra}{space}Py_DECREF({ieff.name});\n") | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |             else: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                 out.write_raw(extra + line) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | InstructionOrCacheEffect = Instruction | parser.CacheEffect | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  | StackEffectMapping = list[tuple[StackEffect, StackEffect]] | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | @dataclasses.dataclass | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | class Component: | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |     instr: Instruction | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |     input_mapping: StackEffectMapping | 
					
						
							|  |  |  |     output_mapping: StackEffectMapping | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def write_body(self, out: Formatter, cache_adjust: int) -> None: | 
					
						
							|  |  |  |         with out.block(""): | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |             for var, ieffect in self.input_mapping: | 
					
						
							|  |  |  |                 out.declare(ieffect, var) | 
					
						
							|  |  |  |             for _, oeffect in self.output_mapping: | 
					
						
							|  |  |  |                 out.declare(oeffect, None) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |             self.instr.write_body(out, dedent=-4, cache_adjust=cache_adjust) | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |             for var, oeffect in self.output_mapping: | 
					
						
							|  |  |  |                 out.assign(var, oeffect) | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | @dataclasses.dataclass | 
					
						
							|  |  |  | class SuperOrMacroInstruction: | 
					
						
							|  |  |  |     """Common fields for super- and macro instructions.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     name: str | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |     stack: list[StackEffect] | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |     initial_sp: int | 
					
						
							|  |  |  |     final_sp: int | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |     instr_fmt: str | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | @dataclasses.dataclass | 
					
						
							|  |  |  | class SuperInstruction(SuperOrMacroInstruction): | 
					
						
							|  |  |  |     """A super-instruction.""" | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     super: parser.Super | 
					
						
							|  |  |  |     parts: list[Component] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | @dataclasses.dataclass | 
					
						
							|  |  |  | class MacroInstruction(SuperOrMacroInstruction): | 
					
						
							|  |  |  |     """A macro instruction.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     macro: parser.Macro | 
					
						
							|  |  |  |     parts: list[Component | parser.CacheEffect] | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  | INSTR_FMT_PREFIX = "INSTR_FMT_" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | class Analyzer: | 
					
						
							|  |  |  |     """Parse input, analyze it, and write to output.""" | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     filename: str | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     output_filename: str | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     src: str | 
					
						
							|  |  |  |     errors: int = 0 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def __init__(self, filename: str, output_filename: str): | 
					
						
							|  |  |  |         """Read the input file.""" | 
					
						
							|  |  |  |         self.filename = filename | 
					
						
							|  |  |  |         self.output_filename = output_filename | 
					
						
							|  |  |  |         with open(filename) as f: | 
					
						
							|  |  |  |             self.src = f.read() | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |     def error(self, msg: str, node: parser.Node) -> None: | 
					
						
							|  |  |  |         lineno = 0 | 
					
						
							|  |  |  |         if context := node.context: | 
					
						
							|  |  |  |             # Use line number of first non-comment in the node | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |             for token in context.owner.tokens[context.begin : context.end]: | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                 lineno = token.line | 
					
						
							|  |  |  |                 if token.kind != "COMMENT": | 
					
						
							|  |  |  |                     break | 
					
						
							|  |  |  |         print(f"{self.filename}:{lineno}: {msg}", file=sys.stderr) | 
					
						
							|  |  |  |         self.errors += 1 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |     everything: list[parser.InstDef | parser.Super | parser.Macro] | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |     instrs: dict[str, Instruction]  # Includes ops | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     supers: dict[str, parser.Super] | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |     super_instrs: dict[str, SuperInstruction] | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     macros: dict[str, parser.Macro] | 
					
						
							|  |  |  |     macro_instrs: dict[str, MacroInstruction] | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     families: dict[str, parser.Family] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def parse(self) -> None: | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         """Parse the source text.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         We only want the parser to see the stuff between the | 
					
						
							|  |  |  |         begin and end markers. | 
					
						
							|  |  |  |         """
 | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         psr = parser.Parser(self.src, filename=self.filename) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # Skip until begin marker | 
					
						
							|  |  |  |         while tkn := psr.next(raw=True): | 
					
						
							|  |  |  |             if tkn.text == BEGIN_MARKER: | 
					
						
							|  |  |  |                 break | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  |         else: | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |             raise psr.make_syntax_error( | 
					
						
							|  |  |  |                 f"Couldn't find {BEGIN_MARKER!r} in {psr.filename}" | 
					
						
							|  |  |  |             ) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         start = psr.getpos() | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         # Find end marker, then delete everything after it | 
					
						
							|  |  |  |         while tkn := psr.next(raw=True): | 
					
						
							|  |  |  |             if tkn.text == END_MARKER: | 
					
						
							|  |  |  |                 break | 
					
						
							|  |  |  |         del psr.tokens[psr.getpos() - 1 :] | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         # Parse from start | 
					
						
							|  |  |  |         psr.setpos(start) | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |         self.everything = [] | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         self.instrs = {} | 
					
						
							|  |  |  |         self.supers = {} | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         self.macros = {} | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         self.families = {} | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         while thing := psr.definition(): | 
					
						
							|  |  |  |             match thing: | 
					
						
							|  |  |  |                 case parser.InstDef(name=name): | 
					
						
							|  |  |  |                     self.instrs[name] = Instruction(thing) | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |                     self.everything.append(thing) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                 case parser.Super(name): | 
					
						
							|  |  |  |                     self.supers[name] = thing | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |                     self.everything.append(thing) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                 case parser.Macro(name): | 
					
						
							|  |  |  |                     self.macros[name] = thing | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |                     self.everything.append(thing) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                 case parser.Family(name): | 
					
						
							|  |  |  |                     self.families[name] = thing | 
					
						
							|  |  |  |                 case _: | 
					
						
							|  |  |  |                     typing.assert_never(thing) | 
					
						
							|  |  |  |         if not psr.eof(): | 
					
						
							|  |  |  |             raise psr.make_syntax_error("Extra stuff at the end") | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |         print( | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |             f"Read {len(self.instrs)} instructions/ops, " | 
					
						
							|  |  |  |             f"{len(self.supers)} supers, {len(self.macros)} macros, " | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |             f"and {len(self.families)} families from {self.filename}", | 
					
						
							|  |  |  |             file=sys.stderr, | 
					
						
							|  |  |  |         ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def analyze(self) -> None: | 
					
						
							|  |  |  |         """Analyze the inputs.
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         Raises SystemExit if there is an error. | 
					
						
							|  |  |  |         """
 | 
					
						
							|  |  |  |         self.find_predictions() | 
					
						
							|  |  |  |         self.map_families() | 
					
						
							|  |  |  |         self.check_families() | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         self.analyze_register_instrs() | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         self.analyze_supers_and_macros() | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def find_predictions(self) -> None: | 
					
						
							|  |  |  |         """Find the instructions that need PREDICTED() labels.""" | 
					
						
							|  |  |  |         for instr in self.instrs.values(): | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |             targets = set(instr.predictions) | 
					
						
							|  |  |  |             for line in instr.block_text: | 
					
						
							|  |  |  |                 if m := re.match(RE_PREDICTED, line): | 
					
						
							|  |  |  |                     targets.add(m.group(1)) | 
					
						
							|  |  |  |             for target in targets: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                 if target_instr := self.instrs.get(target): | 
					
						
							|  |  |  |                     target_instr.predicted = True | 
					
						
							|  |  |  |                 else: | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                     self.error( | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                         f"Unknown instruction {target!r} predicted in {instr.name!r}", | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                         instr.inst,  # TODO: Use better location | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                     ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def map_families(self) -> None: | 
					
						
							|  |  |  |         """Make instruction names back to their family, if they have one.""" | 
					
						
							|  |  |  |         for family in self.families.values(): | 
					
						
							|  |  |  |             for member in family.members: | 
					
						
							|  |  |  |                 if member_instr := self.instrs.get(member): | 
					
						
							|  |  |  |                     member_instr.family = family | 
					
						
							|  |  |  |                 else: | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                     self.error( | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                         f"Unknown instruction {member!r} referenced in family {family.name!r}", | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                         family, | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                     ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def check_families(self) -> None: | 
					
						
							|  |  |  |         """Check each family:
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |         - Must have at least 2 members | 
					
						
							|  |  |  |         - All members must be known instructions | 
					
						
							|  |  |  |         - All members must have the same cache, input and output effects | 
					
						
							|  |  |  |         """
 | 
					
						
							|  |  |  |         for family in self.families.values(): | 
					
						
							|  |  |  |             if len(family.members) < 2: | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                 self.error(f"Family {family.name!r} has insufficient members", family) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |             members = [member for member in family.members if member in self.instrs] | 
					
						
							|  |  |  |             if members != family.members: | 
					
						
							|  |  |  |                 unknown = set(family.members) - set(members) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                 self.error( | 
					
						
							|  |  |  |                     f"Family {family.name!r} has unknown members: {unknown}", family | 
					
						
							|  |  |  |                 ) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |             if len(members) < 2: | 
					
						
							|  |  |  |                 continue | 
					
						
							|  |  |  |             head = self.instrs[members[0]] | 
					
						
							|  |  |  |             cache = head.cache_offset | 
					
						
							|  |  |  |             input = len(head.input_effects) | 
					
						
							|  |  |  |             output = len(head.output_effects) | 
					
						
							|  |  |  |             for member in members[1:]: | 
					
						
							|  |  |  |                 instr = self.instrs[member] | 
					
						
							|  |  |  |                 c = instr.cache_offset | 
					
						
							|  |  |  |                 i = len(instr.input_effects) | 
					
						
							|  |  |  |                 o = len(instr.output_effects) | 
					
						
							|  |  |  |                 if (c, i, o) != (cache, input, output): | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                     self.error( | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                         f"Family {family.name!r} has inconsistent " | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                         f"(cache, inputs, outputs) effects:\n" | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                         f"  {family.members[0]} = {(cache, input, output)}; " | 
					
						
							|  |  |  |                         f"{member} = {(c, i, o)}", | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |                         family, | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |                     ) | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |     def analyze_register_instrs(self) -> None: | 
					
						
							|  |  |  |         for instr in self.instrs.values(): | 
					
						
							|  |  |  |             if instr.register: | 
					
						
							|  |  |  |                 instr.analyze_registers(self) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def analyze_supers_and_macros(self) -> None: | 
					
						
							|  |  |  |         """Analyze each super- and macro instruction.""" | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |         self.super_instrs = {} | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         self.macro_instrs = {} | 
					
						
							|  |  |  |         for name, super in self.supers.items(): | 
					
						
							|  |  |  |             self.super_instrs[name] = self.analyze_super(super) | 
					
						
							|  |  |  |         for name, macro in self.macros.items(): | 
					
						
							|  |  |  |             self.macro_instrs[name] = self.analyze_macro(macro) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def analyze_super(self, super: parser.Super) -> SuperInstruction: | 
					
						
							|  |  |  |         components = self.check_super_components(super) | 
					
						
							|  |  |  |         stack, initial_sp = self.stack_analysis(components) | 
					
						
							|  |  |  |         sp = initial_sp | 
					
						
							|  |  |  |         parts: list[Component] = [] | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |         format = "" | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |         for instr in components: | 
					
						
							|  |  |  |             part, sp = self.analyze_instruction(instr, stack, sp) | 
					
						
							|  |  |  |             parts.append(part) | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |             format += instr.instr_fmt | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         final_sp = sp | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |         return SuperInstruction(super.name, stack, initial_sp, final_sp, format, super, parts) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def analyze_macro(self, macro: parser.Macro) -> MacroInstruction: | 
					
						
							|  |  |  |         components = self.check_macro_components(macro) | 
					
						
							|  |  |  |         stack, initial_sp = self.stack_analysis(components) | 
					
						
							|  |  |  |         sp = initial_sp | 
					
						
							|  |  |  |         parts: list[Component | parser.CacheEffect] = [] | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |         format = "IB"  # Macros don't support register instructions yet | 
					
						
							|  |  |  |         cache = "C" | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         for component in components: | 
					
						
							|  |  |  |             match component: | 
					
						
							|  |  |  |                 case parser.CacheEffect() as ceffect: | 
					
						
							|  |  |  |                     parts.append(ceffect) | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |                     for _ in range(ceffect.size): | 
					
						
							|  |  |  |                         format += cache | 
					
						
							|  |  |  |                         cache = "0" | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                 case Instruction() as instr: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                     part, sp = self.analyze_instruction(instr, stack, sp) | 
					
						
							|  |  |  |                     parts.append(part) | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |                     for ce in instr.cache_effects: | 
					
						
							|  |  |  |                         for _ in range(ce.size): | 
					
						
							|  |  |  |                             format += cache | 
					
						
							|  |  |  |                             cache = "0" | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                 case _: | 
					
						
							|  |  |  |                     typing.assert_never(component) | 
					
						
							|  |  |  |         final_sp = sp | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |         return MacroInstruction(macro.name, stack, initial_sp, final_sp, format, macro, parts) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |     def analyze_instruction( | 
					
						
							|  |  |  |         self, instr: Instruction, stack: list[StackEffect], sp: int | 
					
						
							|  |  |  |     ) -> tuple[Component, int]: | 
					
						
							|  |  |  |         input_mapping: StackEffectMapping = [] | 
					
						
							|  |  |  |         for ieffect in reversed(instr.input_effects): | 
					
						
							|  |  |  |             sp -= 1 | 
					
						
							|  |  |  |             input_mapping.append((stack[sp], ieffect)) | 
					
						
							|  |  |  |         output_mapping: StackEffectMapping = [] | 
					
						
							|  |  |  |         for oeffect in instr.output_effects: | 
					
						
							|  |  |  |             output_mapping.append((stack[sp], oeffect)) | 
					
						
							|  |  |  |             sp += 1 | 
					
						
							|  |  |  |         return Component(instr, input_mapping, output_mapping), sp | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def check_super_components(self, super: parser.Super) -> list[Instruction]: | 
					
						
							|  |  |  |         components: list[Instruction] = [] | 
					
						
							|  |  |  |         for op in super.ops: | 
					
						
							|  |  |  |             if op.name not in self.instrs: | 
					
						
							|  |  |  |                 self.error(f"Unknown instruction {op.name!r}", super) | 
					
						
							|  |  |  |             else: | 
					
						
							|  |  |  |                 components.append(self.instrs[op.name]) | 
					
						
							|  |  |  |         return components | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def check_macro_components( | 
					
						
							|  |  |  |         self, macro: parser.Macro | 
					
						
							|  |  |  |     ) -> list[InstructionOrCacheEffect]: | 
					
						
							|  |  |  |         components: list[InstructionOrCacheEffect] = [] | 
					
						
							|  |  |  |         for uop in macro.uops: | 
					
						
							|  |  |  |             match uop: | 
					
						
							|  |  |  |                 case parser.OpName(name): | 
					
						
							|  |  |  |                     if name not in self.instrs: | 
					
						
							|  |  |  |                         self.error(f"Unknown instruction {name!r}", macro) | 
					
						
							|  |  |  |                     components.append(self.instrs[name]) | 
					
						
							|  |  |  |                 case parser.CacheEffect(): | 
					
						
							|  |  |  |                     components.append(uop) | 
					
						
							|  |  |  |                 case _: | 
					
						
							|  |  |  |                     typing.assert_never(uop) | 
					
						
							|  |  |  |         return components | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def stack_analysis( | 
					
						
							|  |  |  |         self, components: typing.Iterable[InstructionOrCacheEffect] | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |     ) -> tuple[list[StackEffect], int]: | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         """Analyze a super-instruction or macro.
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-27 17:11:03 -08:00
										 |  |  |         Ignore cache effects. | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |         Return the list of variable names and the initial stack pointer. | 
					
						
							|  |  |  |         """
 | 
					
						
							|  |  |  |         lowest = current = highest = 0 | 
					
						
							|  |  |  |         for thing in components: | 
					
						
							|  |  |  |             match thing: | 
					
						
							|  |  |  |                 case Instruction() as instr: | 
					
						
							|  |  |  |                     current -= len(instr.input_effects) | 
					
						
							|  |  |  |                     lowest = min(lowest, current) | 
					
						
							|  |  |  |                     current += len(instr.output_effects) | 
					
						
							|  |  |  |                     highest = max(highest, current) | 
					
						
							|  |  |  |                 case parser.CacheEffect(): | 
					
						
							|  |  |  |                     pass | 
					
						
							|  |  |  |                 case _: | 
					
						
							|  |  |  |                     typing.assert_never(thing) | 
					
						
							|  |  |  |         # At this point, 'current' is the net stack effect, | 
					
						
							|  |  |  |         # and 'lowest' and 'highest' are the extremes. | 
					
						
							|  |  |  |         # Note that 'lowest' may be negative. | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |         # TODO: Reverse the numbering. | 
					
						
							|  |  |  |         stack = [ | 
					
						
							|  |  |  |             StackEffect(f"_tmp_{i+1}", "") for i in reversed(range(highest - lowest)) | 
					
						
							|  |  |  |         ] | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         return stack, -lowest | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |     def write_metadata(self) -> None: | 
					
						
							|  |  |  |         """Write instruction metadata to output file.""" | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |         # Compute the set of all instruction formats. | 
					
						
							|  |  |  |         all_formats: set[str] = set() | 
					
						
							|  |  |  |         for thing in self.everything: | 
					
						
							|  |  |  |             match thing: | 
					
						
							|  |  |  |                 case parser.InstDef(): | 
					
						
							|  |  |  |                     format = self.instrs[thing.name].instr_fmt | 
					
						
							|  |  |  |                 case parser.Super(): | 
					
						
							|  |  |  |                     format = self.super_instrs[thing.name].instr_fmt | 
					
						
							|  |  |  |                 case parser.Macro(): | 
					
						
							|  |  |  |                     format = self.macro_instrs[thing.name].instr_fmt | 
					
						
							|  |  |  |                 case _: | 
					
						
							|  |  |  |                     typing.assert_never(thing) | 
					
						
							|  |  |  |             all_formats.add(format) | 
					
						
							|  |  |  |         # Turn it into a list of enum definitions. | 
					
						
							|  |  |  |         format_enums = [INSTR_FMT_PREFIX + format for format in sorted(all_formats)] | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         with open(self.output_filename, "w") as f: | 
					
						
							|  |  |  |             # Write provenance header | 
					
						
							|  |  |  |             f.write( | 
					
						
							|  |  |  |                 f"// This file is generated by {os.path.relpath(__file__)} --metadata\n" | 
					
						
							|  |  |  |             ) | 
					
						
							|  |  |  |             f.write(f"// from {os.path.relpath(self.filename)}\n") | 
					
						
							|  |  |  |             f.write(f"// Do not edit!\n") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             # Create formatter; the rest of the code uses this | 
					
						
							|  |  |  |             self.out = Formatter(f, 0) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             # Write variable definition | 
					
						
							|  |  |  |             self.out.emit("enum Direction { DIR_NONE, DIR_READ, DIR_WRITE };") | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |             self.out.emit(f"enum InstructionFormat {{ {', '.join(format_enums)} }};") | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |             self.out.emit("static const struct {") | 
					
						
							|  |  |  |             with self.out.indent(): | 
					
						
							|  |  |  |                 self.out.emit("short n_popped;") | 
					
						
							|  |  |  |                 self.out.emit("short n_pushed;") | 
					
						
							|  |  |  |                 self.out.emit("enum Direction dir_op1;") | 
					
						
							|  |  |  |                 self.out.emit("enum Direction dir_op2;") | 
					
						
							|  |  |  |                 self.out.emit("enum Direction dir_op3;") | 
					
						
							|  |  |  |                 self.out.emit("bool valid_entry;") | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |                 self.out.emit("enum InstructionFormat instr_format;") | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |             self.out.emit("} _PyOpcode_opcode_metadata[256] = {") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             # Write metadata for each instruction | 
					
						
							|  |  |  |             for thing in self.everything: | 
					
						
							|  |  |  |                 match thing: | 
					
						
							|  |  |  |                     case parser.InstDef(): | 
					
						
							|  |  |  |                         if thing.kind != "op": | 
					
						
							|  |  |  |                             self.write_metadata_for_inst(self.instrs[thing.name]) | 
					
						
							|  |  |  |                     case parser.Super(): | 
					
						
							|  |  |  |                         self.write_metadata_for_super(self.super_instrs[thing.name]) | 
					
						
							|  |  |  |                     case parser.Macro(): | 
					
						
							|  |  |  |                         self.write_metadata_for_macro(self.macro_instrs[thing.name]) | 
					
						
							|  |  |  |                     case _: | 
					
						
							|  |  |  |                         typing.assert_never(thing) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             # Write end of array | 
					
						
							|  |  |  |             self.out.emit("};") | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def write_metadata_for_inst(self, instr: Instruction) -> None: | 
					
						
							|  |  |  |         """Write metadata for a single instruction.""" | 
					
						
							|  |  |  |         dir_op1 = dir_op2 = dir_op3 = "DIR_NONE" | 
					
						
							|  |  |  |         if instr.kind == "legacy": | 
					
						
							|  |  |  |             n_popped = n_pushed = -1 | 
					
						
							|  |  |  |             assert not instr.register | 
					
						
							|  |  |  |         else: | 
					
						
							|  |  |  |             n_popped = len(instr.input_effects) | 
					
						
							|  |  |  |             n_pushed = len(instr.output_effects) | 
					
						
							|  |  |  |             if instr.register: | 
					
						
							|  |  |  |                 directions: list[str] = [] | 
					
						
							|  |  |  |                 directions.extend("DIR_READ" for _ in instr.input_effects) | 
					
						
							|  |  |  |                 directions.extend("DIR_WRITE" for _ in instr.output_effects) | 
					
						
							|  |  |  |                 directions.extend("DIR_NONE" for _ in range(3)) | 
					
						
							|  |  |  |                 dir_op1, dir_op2, dir_op3 = directions[:3] | 
					
						
							|  |  |  |         self.out.emit( | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |             f'    [{instr.name}] = {{ {n_popped}, {n_pushed}, {dir_op1}, {dir_op2}, {dir_op3}, true, {INSTR_FMT_PREFIX}{instr.instr_fmt} }},' | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def write_metadata_for_super(self, sup: SuperInstruction) -> None: | 
					
						
							|  |  |  |         """Write metadata for a super-instruction.""" | 
					
						
							|  |  |  |         n_popped = sum(len(comp.instr.input_effects) for comp in sup.parts) | 
					
						
							|  |  |  |         n_pushed = sum(len(comp.instr.output_effects) for comp in sup.parts) | 
					
						
							|  |  |  |         dir_op1 = dir_op2 = dir_op3 = "DIR_NONE" | 
					
						
							|  |  |  |         self.out.emit( | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |             f'    [{sup.name}] = {{ {n_popped}, {n_pushed}, {dir_op1}, {dir_op2}, {dir_op3}, true, {INSTR_FMT_PREFIX}{sup.instr_fmt} }},' | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         ) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     def write_metadata_for_macro(self, mac: MacroInstruction) -> None: | 
					
						
							|  |  |  |         """Write metadata for a macro-instruction.""" | 
					
						
							|  |  |  |         parts = [comp for comp in mac.parts if isinstance(comp, Component)] | 
					
						
							|  |  |  |         n_popped = sum(len(comp.instr.input_effects) for comp in parts) | 
					
						
							|  |  |  |         n_pushed = sum(len(comp.instr.output_effects) for comp in parts) | 
					
						
							|  |  |  |         dir_op1 = dir_op2 = dir_op3 = "DIR_NONE" | 
					
						
							|  |  |  |         self.out.emit( | 
					
						
							| 
									
										
										
										
											2023-01-09 15:53:01 -08:00
										 |  |  |             f'    [{mac.name}] = {{ {n_popped}, {n_pushed}, {dir_op1}, {dir_op2}, {dir_op3}, true, {INSTR_FMT_PREFIX}{mac.instr_fmt} }},' | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |         ) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def write_instructions(self) -> None: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |         """Write instructions to output file.""" | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         with open(self.output_filename, "w") as f: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |             # Write provenance header | 
					
						
							|  |  |  |             f.write(f"// This file is generated by {os.path.relpath(__file__)}\n") | 
					
						
							|  |  |  |             f.write(f"// from {os.path.relpath(self.filename)}\n") | 
					
						
							|  |  |  |             f.write(f"// Do not edit!\n") | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |             # Create formatter; the rest of the code uses this | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |             self.out = Formatter(f, 8) | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |             # Write and count instructions of all kinds | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  |             n_instrs = 0 | 
					
						
							|  |  |  |             n_supers = 0 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |             n_macros = 0 | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |             for thing in self.everything: | 
					
						
							|  |  |  |                 match thing: | 
					
						
							|  |  |  |                     case parser.InstDef(): | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |                         if thing.kind != "op": | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |                             n_instrs += 1 | 
					
						
							|  |  |  |                             self.write_instr(self.instrs[thing.name]) | 
					
						
							|  |  |  |                     case parser.Super(): | 
					
						
							|  |  |  |                         n_supers += 1 | 
					
						
							|  |  |  |                         self.write_super(self.super_instrs[thing.name]) | 
					
						
							|  |  |  |                     case parser.Macro(): | 
					
						
							|  |  |  |                         n_macros += 1 | 
					
						
							|  |  |  |                         self.write_macro(self.macro_instrs[thing.name]) | 
					
						
							|  |  |  |                     case _: | 
					
						
							|  |  |  |                         typing.assert_never(thing) | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         print( | 
					
						
							|  |  |  |             f"Wrote {n_instrs} instructions, {n_supers} supers, " | 
					
						
							|  |  |  |             f"and {n_macros} macros to {self.output_filename}", | 
					
						
							|  |  |  |             file=sys.stderr, | 
					
						
							|  |  |  |         ) | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-08 15:54:07 -08:00
										 |  |  |     def write_instr(self, instr: Instruction) -> None: | 
					
						
							|  |  |  |         name = instr.name | 
					
						
							|  |  |  |         self.out.emit("") | 
					
						
							|  |  |  |         with self.out.block(f"TARGET({name})"): | 
					
						
							|  |  |  |             if instr.predicted: | 
					
						
							|  |  |  |                 self.out.emit(f"PREDICTED({name});") | 
					
						
							|  |  |  |             instr.write(self.out) | 
					
						
							|  |  |  |             if not instr.always_exits: | 
					
						
							|  |  |  |                 for prediction in instr.predictions: | 
					
						
							|  |  |  |                     self.out.emit(f"PREDICT({prediction});") | 
					
						
							|  |  |  |                 self.out.emit(f"DISPATCH();") | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     def write_super(self, sup: SuperInstruction) -> None: | 
					
						
							|  |  |  |         """Write code for a super-instruction.""" | 
					
						
							|  |  |  |         with self.wrap_super_or_macro(sup): | 
					
						
							|  |  |  |             first = True | 
					
						
							|  |  |  |             for comp in sup.parts: | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |                 if first: | 
					
						
							|  |  |  |                     pass | 
					
						
							|  |  |  |                     # self.out.emit("JUMPBY(OPSIZE(opcode) - 1);") | 
					
						
							|  |  |  |                 else: | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                     self.out.emit("NEXTOPARG();") | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                     self.out.emit("JUMPBY(1);") | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |                     # self.out.emit("JUMPBY(OPSIZE(opcode));") | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                 first = False | 
					
						
							|  |  |  |                 comp.write_body(self.out, 0) | 
					
						
							|  |  |  |                 if comp.instr.cache_offset: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                     self.out.emit(f"JUMPBY({comp.instr.cache_offset});") | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |     def write_macro(self, mac: MacroInstruction) -> None: | 
					
						
							|  |  |  |         """Write code for a macro instruction.""" | 
					
						
							|  |  |  |         with self.wrap_super_or_macro(mac): | 
					
						
							|  |  |  |             cache_adjust = 0 | 
					
						
							|  |  |  |             for part in mac.parts: | 
					
						
							|  |  |  |                 match part: | 
					
						
							|  |  |  |                     case parser.CacheEffect(size=size): | 
					
						
							|  |  |  |                         cache_adjust += size | 
					
						
							|  |  |  |                     case Component() as comp: | 
					
						
							|  |  |  |                         comp.write_body(self.out, cache_adjust) | 
					
						
							|  |  |  |                         cache_adjust += comp.instr.cache_offset | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |             if cache_adjust: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                 self.out.emit(f"JUMPBY({cache_adjust});") | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |     @contextlib.contextmanager | 
					
						
							|  |  |  |     def wrap_super_or_macro(self, up: SuperOrMacroInstruction): | 
					
						
							|  |  |  |         """Shared boilerplate for super- and macro instructions.""" | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |         # TODO: Somewhere (where?) make it so that if one instruction | 
					
						
							|  |  |  |         # has an output that is input to another, and the variable names | 
					
						
							|  |  |  |         # and types match and don't conflict with other instructions, | 
					
						
							|  |  |  |         # that variable is declared with the right name and type in the | 
					
						
							|  |  |  |         # outer block, rather than trusting the compiler to optimize it. | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |         self.out.emit("") | 
					
						
							|  |  |  |         with self.out.block(f"TARGET({up.name})"): | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |             for i, var in reversed(list(enumerate(up.stack))): | 
					
						
							|  |  |  |                 src = None | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |                 if i < up.initial_sp: | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                     src = StackEffect(f"PEEK({up.initial_sp - i})", "") | 
					
						
							|  |  |  |                 self.out.declare(var, src) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |             yield | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |             self.out.stack_adjust(up.final_sp - up.initial_sp) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |             for i, var in enumerate(reversed(up.stack[: up.final_sp]), 1): | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |                 dst = StackEffect(f"PEEK({i})", "") | 
					
						
							|  |  |  |                 self.out.assign(dst, var) | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  | 
 | 
					
						
							|  |  |  |             self.out.emit(f"DISPATCH();") | 
					
						
							| 
									
										
										
										
											2022-11-22 16:04:57 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  | def extract_block_text(block: parser.Block) -> tuple[list[str], list[str]]: | 
					
						
							|  |  |  |     # Get lines of text with proper dedent | 
					
						
							|  |  |  |     blocklines = block.text.splitlines(True) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # Remove blank lines from both ends | 
					
						
							|  |  |  |     while blocklines and not blocklines[0].strip(): | 
					
						
							|  |  |  |         blocklines.pop(0) | 
					
						
							|  |  |  |     while blocklines and not blocklines[-1].strip(): | 
					
						
							|  |  |  |         blocklines.pop() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # Remove leading and trailing braces | 
					
						
							|  |  |  |     assert blocklines and blocklines[0].strip() == "{" | 
					
						
							|  |  |  |     assert blocklines and blocklines[-1].strip() == "}" | 
					
						
							|  |  |  |     blocklines.pop() | 
					
						
							|  |  |  |     blocklines.pop(0) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # Remove trailing blank lines | 
					
						
							|  |  |  |     while blocklines and not blocklines[-1].strip(): | 
					
						
							|  |  |  |         blocklines.pop() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     # Separate PREDICT(...) macros from end | 
					
						
							|  |  |  |     predictions: list[str] = [] | 
					
						
							|  |  |  |     while blocklines and (m := re.match(r"^\s*PREDICT\((\w+)\);\s*$", blocklines[-1])): | 
					
						
							|  |  |  |         predictions.insert(0, m.group(1)) | 
					
						
							|  |  |  |         blocklines.pop() | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  |     return blocklines, predictions | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | def always_exits(lines: list[str]) -> bool: | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     """Determine whether a block always ends in a return/goto/etc.""" | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  |     if not lines: | 
					
						
							|  |  |  |         return False | 
					
						
							| 
									
										
											  
											
												GH-98831: Typed stack effects, and more instructions converted (#99764)
Stack effects can now have a type, e.g. `inst(X, (left, right -- jump/uint64_t)) { ... }`.
Instructions converted to the non-legacy format:
* COMPARE_OP
* COMPARE_OP_FLOAT_JUMP
* COMPARE_OP_INT_JUMP
* COMPARE_OP_STR_JUMP
* STORE_ATTR
* DELETE_ATTR
* STORE_GLOBAL
* STORE_ATTR_INSTANCE_VALUE
* STORE_ATTR_WITH_HINT
* STORE_ATTR_SLOT, and complete the store_attr family
* Complete the store_subscr family: STORE_SUBSCR{,DICT,LIST_INT}
  (STORE_SUBSCR was alread half converted,
  but wasn't using cache effects yet.)
* DELETE_SUBSCR
* PRINT_EXPR
* INTERPRETER_EXIT (a bit weird, ends in return)
* RETURN_VALUE
* GET_AITER (had to restructure it some)
  The original had mysterious `SET_TOP(NULL)` before `goto error`.
  I assume those just account for `obj` having been decref'ed,
  so I got rid of them in favor of the cleanup implied by `ERROR_IF()`.
* LIST_APPEND (a bit unhappy with it)
* SET_ADD (also a bit unhappy with it)
Various other improvements/refactorings as well.
											
										 
											2022-12-08 13:31:27 -08:00
										 |  |  |     line = lines[-1].rstrip() | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  |     # Indent must match exactly (TODO: Do something better) | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     if line[:12] != " " * 12: | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  |         return False | 
					
						
							|  |  |  |     line = line[12:] | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     return line.startswith( | 
					
						
							|  |  |  |         ("goto ", "return ", "DISPATCH", "GO_TO_", "Py_UNREACHABLE()") | 
					
						
							|  |  |  |     ) | 
					
						
							| 
									
										
										
										
											2022-11-15 19:59:19 -08:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2023-01-13 17:06:45 -08:00
										 |  |  | def variable_used(block: parser.Block, name: str) -> bool: | 
					
						
							|  |  |  |     """Determine whether a variable with a given name is used in a block.""" | 
					
						
							|  |  |  |     return any(token.kind == "IDENTIFIER" and token.text == name for token in block.tokens) | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | def main(): | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     """Parse command line, parse input, analyze, write output.""" | 
					
						
							|  |  |  |     args = arg_parser.parse_args()  # Prints message and sys.exit(2) on error | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |     if args.metadata: | 
					
						
							|  |  |  |         if args.output == DEFAULT_OUTPUT: | 
					
						
							|  |  |  |             args.output = DEFAULT_METADATA_OUTPUT | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     a = Analyzer(args.input, args.output)  # Raises OSError if input unreadable | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     a.parse()  # Raises SyntaxError on failure | 
					
						
							| 
									
										
										
										
											2022-12-02 19:57:30 -08:00
										 |  |  |     a.analyze()  # Prints messages and sets a.errors on failure | 
					
						
							| 
									
										
										
										
											2022-11-17 17:06:07 -08:00
										 |  |  |     if a.errors: | 
					
						
							|  |  |  |         sys.exit(f"Found {a.errors} errors") | 
					
						
							| 
									
										
										
										
											2023-01-05 13:01:07 -08:00
										 |  |  |     if args.metadata: | 
					
						
							|  |  |  |         a.write_metadata() | 
					
						
							|  |  |  |     else: | 
					
						
							|  |  |  |         a.write_instructions()  # Raises OSError if output can't be written | 
					
						
							| 
									
										
										
										
											2022-11-02 21:31:26 -07:00
										 |  |  | 
 | 
					
						
							|  |  |  | 
 | 
					
						
							|  |  |  | if __name__ == "__main__": | 
					
						
							|  |  |  |     main() |