2022-11-17 21:06:07 -04:00
|
|
|
"""Generate the main interpreter switch.
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2022-11-17 21:06:07 -04:00
|
|
|
Reads the instruction definitions from bytecodes.c.
|
|
|
|
Writes the cases to generated_cases.c.h, which is #included in ceval.c.
|
|
|
|
"""
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
import argparse
|
2022-11-22 20:04:57 -04:00
|
|
|
import contextlib
|
|
|
|
import dataclasses
|
2022-11-04 21:40:43 -03:00
|
|
|
import os
|
2022-11-04 19:30:17 -03:00
|
|
|
import re
|
2022-11-03 01:31:26 -03:00
|
|
|
import sys
|
2022-11-17 21:06:07 -04:00
|
|
|
import typing
|
2022-11-03 01:31:26 -03: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 17:31:27 -04:00
|
|
|
from parser import StackEffect
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
HERE = os.path.dirname(__file__)
|
|
|
|
ROOT = os.path.join(HERE, "../..")
|
|
|
|
THIS = os.path.relpath(__file__, ROOT)
|
|
|
|
|
|
|
|
DEFAULT_INPUT = os.path.relpath(os.path.join(ROOT, "Python/bytecodes.c"))
|
|
|
|
DEFAULT_OUTPUT = os.path.relpath(os.path.join(ROOT, "Python/generated_cases.c.h"))
|
2023-01-05 17:01:07 -04:00
|
|
|
DEFAULT_METADATA_OUTPUT = os.path.relpath(
|
2023-01-17 19:59:19 -04:00
|
|
|
os.path.join(ROOT, "Python/opcode_metadata.h")
|
2023-01-05 17:01:07 -04:00
|
|
|
)
|
2022-11-17 21:06:07 -04:00
|
|
|
BEGIN_MARKER = "// BEGIN BYTECODES //"
|
|
|
|
END_MARKER = "// END BYTECODES //"
|
2023-01-29 21:28:39 -04:00
|
|
|
RE_PREDICTED = (
|
|
|
|
r"^\s*(?:PREDICT\(|GO_TO_INSTRUCTION\(|DEOPT_IF\(.*?,\s*)(\w+)\);\s*(?://.*)?$"
|
|
|
|
)
|
2022-11-22 20:04:57 -04:00
|
|
|
UNUSED = "unused"
|
|
|
|
BITS_PER_CODE_UNIT = 16
|
2022-11-09 14:50:09 -04:00
|
|
|
|
2022-12-02 23:57:30 -04: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 17:01:07 -04:00
|
|
|
arg_parser.add_argument(
|
|
|
|
"-m",
|
|
|
|
"--metadata",
|
|
|
|
action="store_true",
|
|
|
|
help=f"Generate metadata instead, changes output default to {DEFAULT_METADATA_OUTPUT}",
|
|
|
|
)
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
def effect_size(effect: StackEffect) -> tuple[int, str]:
|
|
|
|
"""Return the 'size' impact of a stack effect.
|
|
|
|
|
|
|
|
Returns a tuple (numeric, symbolic) where:
|
|
|
|
|
|
|
|
- numeric is an int giving the statically analyzable size of the effect
|
|
|
|
- symbolic is a string representing a variable effect (e.g. 'oparg*2')
|
|
|
|
|
|
|
|
At most one of these will be non-zero / non-empty.
|
|
|
|
"""
|
|
|
|
if effect.size:
|
2023-01-29 21:28:39 -04:00
|
|
|
assert not effect.cond, "Array effects cannot have a condition"
|
2023-01-17 19:59:19 -04:00
|
|
|
return 0, effect.size
|
2023-01-29 21:28:39 -04:00
|
|
|
elif effect.cond:
|
|
|
|
return 0, f"{maybe_parenthesize(effect.cond)} ? 1 : 0"
|
2023-01-17 19:59:19 -04:00
|
|
|
else:
|
|
|
|
return 1, ""
|
|
|
|
|
|
|
|
|
|
|
|
def maybe_parenthesize(sym: str) -> str:
|
|
|
|
"""Add parentheses around a string if it contains an operator.
|
|
|
|
|
|
|
|
An exception is made for '*' which is common and harmless
|
|
|
|
in the context where the symbolic size is used.
|
|
|
|
"""
|
|
|
|
if re.match(r"^[\s\w*]+$", sym):
|
|
|
|
return sym
|
|
|
|
else:
|
|
|
|
return f"({sym})"
|
|
|
|
|
|
|
|
|
|
|
|
def list_effect_size(effects: list[StackEffect]) -> tuple[int, str]:
|
|
|
|
numeric = 0
|
|
|
|
symbolic: list[str] = []
|
|
|
|
for effect in effects:
|
|
|
|
diff, sym = effect_size(effect)
|
|
|
|
numeric += diff
|
|
|
|
if sym:
|
|
|
|
symbolic.append(maybe_parenthesize(sym))
|
|
|
|
return numeric, " + ".join(symbolic)
|
|
|
|
|
|
|
|
|
|
|
|
def string_effect_size(arg: tuple[int, str]) -> str:
|
|
|
|
numeric, symbolic = arg
|
|
|
|
if numeric and symbolic:
|
|
|
|
return f"{numeric} + {symbolic}"
|
|
|
|
elif symbolic:
|
|
|
|
return symbolic
|
|
|
|
else:
|
|
|
|
return str(numeric)
|
|
|
|
|
|
|
|
|
2022-12-02 23:57:30 -04: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("}")
|
|
|
|
|
2023-01-29 21:28:39 -04:00
|
|
|
def stack_adjust(
|
|
|
|
self,
|
|
|
|
diff: int,
|
|
|
|
input_effects: list[StackEffect],
|
|
|
|
output_effects: list[StackEffect],
|
|
|
|
):
|
2023-01-17 19:59:19 -04:00
|
|
|
# TODO: Get rid of 'diff' parameter
|
|
|
|
shrink, isym = list_effect_size(input_effects)
|
|
|
|
grow, osym = list_effect_size(output_effects)
|
|
|
|
diff += grow - shrink
|
|
|
|
if isym and isym != osym:
|
|
|
|
self.emit(f"STACK_SHRINK({isym});")
|
|
|
|
if diff < 0:
|
|
|
|
self.emit(f"STACK_SHRINK({-diff});")
|
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 17:31:27 -04:00
|
|
|
if diff > 0:
|
|
|
|
self.emit(f"STACK_GROW({diff});")
|
2023-01-17 19:59:19 -04:00
|
|
|
if osym and osym != isym:
|
|
|
|
self.emit(f"STACK_GROW({osym});")
|
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 17:31:27 -04:00
|
|
|
|
|
|
|
def declare(self, dst: StackEffect, src: StackEffect | None):
|
|
|
|
if dst.name == UNUSED:
|
|
|
|
return
|
2023-01-17 19:59:19 -04:00
|
|
|
typ = f"{dst.type}" if dst.type else "PyObject *"
|
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 17:31:27 -04:00
|
|
|
if src:
|
|
|
|
cast = self.cast(dst, src)
|
|
|
|
init = f" = {cast}{src.name}"
|
2023-01-29 21:28:39 -04:00
|
|
|
elif dst.cond:
|
|
|
|
init = " = NULL"
|
|
|
|
else:
|
|
|
|
init = ""
|
2023-01-17 19:59:19 -04:00
|
|
|
sepa = "" if typ.endswith("*") else " "
|
|
|
|
self.emit(f"{typ}{sepa}{dst.name}{init};")
|
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 17:31:27 -04:00
|
|
|
|
|
|
|
def assign(self, dst: StackEffect, src: StackEffect):
|
|
|
|
if src.name == UNUSED:
|
|
|
|
return
|
|
|
|
cast = self.cast(dst, src)
|
2023-01-17 19:59:19 -04:00
|
|
|
if m := re.match(r"^PEEK\((.*)\)$", dst.name):
|
2023-01-29 21:28:39 -04:00
|
|
|
stmt = f"POKE({m.group(1)}, {cast}{src.name});"
|
|
|
|
if src.cond:
|
|
|
|
stmt = f"if ({src.cond}) {{ {stmt} }}"
|
|
|
|
self.emit(stmt)
|
2023-01-17 19:59:19 -04:00
|
|
|
elif m := re.match(r"^&PEEK\(.*\)$", dst.name):
|
|
|
|
# NOTE: MOVE_ITEMS() does not actually exist.
|
|
|
|
# The only supported output array forms are:
|
|
|
|
# - unused[...]
|
|
|
|
# - X[...] where X[...] matches an input array exactly
|
|
|
|
self.emit(f"MOVE_ITEMS({dst.name}, {src.name}, {src.size});")
|
2023-01-05 17:01:07 -04: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 17:31:27 -04: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 23:57:30 -04:00
|
|
|
|
|
|
|
@dataclasses.dataclass
|
|
|
|
class Instruction:
|
2022-11-17 21:06:07 -04:00
|
|
|
"""An instruction with additional data and code."""
|
|
|
|
|
2022-12-02 23:57:30 -04:00
|
|
|
# Parts of the underlying instruction definition
|
|
|
|
inst: parser.InstDef
|
2023-01-05 17:01:07 -04:00
|
|
|
register: bool
|
|
|
|
kind: typing.Literal["inst", "op", "legacy"] # Legacy means no (input -- output)
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
block_text: list[str] # Block.text, less curlies, less PREDICT() calls
|
|
|
|
predictions: list[str] # Prediction targets (instruction names)
|
2022-12-02 23:57:30 -04:00
|
|
|
|
2022-11-17 21:06:07 -04: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 17:31:27 -04:00
|
|
|
input_effects: list[StackEffect]
|
|
|
|
output_effects: list[StackEffect]
|
2023-01-09 19:53:01 -04:00
|
|
|
unmoved_names: frozenset[str]
|
|
|
|
instr_fmt: str
|
|
|
|
|
|
|
|
# Parallel to input_effects; set later
|
2023-01-05 17:01:07 -04:00
|
|
|
input_registers: list[str] = dataclasses.field(repr=False)
|
|
|
|
output_registers: list[str] = dataclasses.field(repr=False)
|
2022-11-17 21:06:07 -04:00
|
|
|
|
|
|
|
# Set later
|
|
|
|
family: parser.Family | None = None
|
|
|
|
predicted: bool = False
|
|
|
|
|
|
|
|
def __init__(self, inst: parser.InstDef):
|
2022-12-02 23:57:30 -04:00
|
|
|
self.inst = inst
|
2023-01-05 17:01:07 -04:00
|
|
|
self.register = inst.register
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
self.block_text, self.predictions = extract_block_text(self.block)
|
|
|
|
self.always_exits = always_exits(self.block_text)
|
2022-11-17 21:06:07 -04:00
|
|
|
self.cache_effects = [
|
2022-12-02 23:57:30 -04:00
|
|
|
effect for effect in inst.inputs if isinstance(effect, parser.CacheEffect)
|
2022-11-17 21:06:07 -04: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 17:31:27 -04:00
|
|
|
effect for effect in inst.inputs if isinstance(effect, StackEffect)
|
2022-11-17 21:06:07 -04:00
|
|
|
]
|
2022-12-02 23:57:30 -04:00
|
|
|
self.output_effects = inst.outputs # For consistency/completeness
|
2022-12-27 21:11:03 -04: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 19:53:01 -04:00
|
|
|
if self.register:
|
2023-01-13 21:06:45 -04:00
|
|
|
num_regs = len(self.input_effects) + len(self.output_effects)
|
|
|
|
num_dummies = (num_regs // 2) * 2 + 1 - num_regs
|
2023-01-29 21:28:39 -04:00
|
|
|
fmt = "I" + "B" * num_regs + "X" * num_dummies
|
2023-01-09 19:53:01 -04:00
|
|
|
else:
|
2023-01-17 19:59:19 -04:00
|
|
|
if variable_used(inst, "oparg"):
|
2023-01-13 21:06:45 -04:00
|
|
|
fmt = "IB"
|
|
|
|
else:
|
|
|
|
fmt = "IX"
|
2023-01-09 19:53:01 -04: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 21:06:07 -04:00
|
|
|
|
2023-01-05 17:01:07 -04: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 23:57:30 -04:00
|
|
|
def write(self, out: Formatter) -> None:
|
2022-11-17 21:06:07 -04:00
|
|
|
"""Write one instruction, sans prologue and epilogue."""
|
2022-12-02 23:57:30 -04:00
|
|
|
# Write a static assertion that a family's cache size is correct
|
2022-11-17 21:06:07 -04:00
|
|
|
if family := self.family:
|
|
|
|
if self.name == family.members[0]:
|
|
|
|
if cache_size := family.size:
|
2022-12-02 23:57:30 -04:00
|
|
|
out.emit(
|
|
|
|
f"static_assert({cache_size} == "
|
|
|
|
f'{self.cache_offset}, "incorrect cache size");'
|
2022-11-22 20:04:57 -04:00
|
|
|
)
|
2022-11-17 21:06:07 -04:00
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
if not self.register:
|
|
|
|
# Write input stack effect variable declarations and initializations
|
2023-01-17 19:59:19 -04:00
|
|
|
ieffects = list(reversed(self.input_effects))
|
|
|
|
for i, ieffect in enumerate(ieffects):
|
2023-01-29 21:28:39 -04:00
|
|
|
isize = string_effect_size(
|
|
|
|
list_effect_size([ieff for ieff in ieffects[: i + 1]])
|
|
|
|
)
|
2023-01-17 19:59:19 -04:00
|
|
|
if ieffect.size:
|
|
|
|
src = StackEffect(f"&PEEK({isize})", "PyObject **")
|
2023-01-29 21:28:39 -04:00
|
|
|
elif ieffect.cond:
|
|
|
|
src = StackEffect(f"({ieffect.cond}) ? PEEK({isize}) : NULL", "")
|
2023-01-17 19:59:19 -04:00
|
|
|
else:
|
|
|
|
src = StackEffect(f"PEEK({isize})", "")
|
2023-01-05 17:01:07 -04:00
|
|
|
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 21:06:07 -04: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 17:31:27 -04: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 21:06:07 -04:00
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
# out.emit(f"JUMPBY(OPSIZE({self.inst.name}) - 1);")
|
|
|
|
|
2022-12-02 23:57:30 -04:00
|
|
|
self.write_body(out, 0)
|
2022-11-17 21:06:07 -04: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 17:31:27 -04:00
|
|
|
if self.always_exits:
|
2022-11-17 21:06:07 -04:00
|
|
|
return
|
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
if not self.register:
|
|
|
|
# Write net stack growth/shrinkage
|
2023-01-29 21:28:39 -04:00
|
|
|
out.stack_adjust(
|
|
|
|
0,
|
|
|
|
[ieff for ieff in self.input_effects],
|
|
|
|
[oeff for oeff in self.output_effects],
|
|
|
|
)
|
2022-11-17 21:06:07 -04:00
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
# Write output stack effect assignments
|
2023-01-17 19:59:19 -04:00
|
|
|
oeffects = list(reversed(self.output_effects))
|
|
|
|
for i, oeffect in enumerate(oeffects):
|
|
|
|
if oeffect.name in self.unmoved_names:
|
|
|
|
continue
|
2023-01-29 21:28:39 -04:00
|
|
|
osize = string_effect_size(
|
|
|
|
list_effect_size([oeff for oeff in oeffects[: i + 1]])
|
|
|
|
)
|
2023-01-17 19:59:19 -04:00
|
|
|
if oeffect.size:
|
|
|
|
dst = StackEffect(f"&PEEK({osize})", "PyObject **")
|
|
|
|
else:
|
|
|
|
dst = StackEffect(f"PEEK({osize})", "")
|
|
|
|
out.assign(dst, oeffect)
|
2023-01-05 17:01:07 -04:00
|
|
|
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 17:31:27 -04:00
|
|
|
out.assign(dst, oeffect)
|
2022-11-17 21:06:07 -04: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 17:31:27 -04:00
|
|
|
out.emit(f"JUMPBY({self.cache_offset});")
|
2022-11-17 21:06:07 -04:00
|
|
|
|
2022-12-02 23:57:30 -04:00
|
|
|
def write_body(self, out: Formatter, dedent: int, cache_adjust: int = 0) -> None:
|
2022-11-17 21:06:07 -04:00
|
|
|
"""Write the instruction body."""
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
typ = "PyObject *"
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
typ = f"uint{bits}_t "
|
2022-12-02 23:57:30 -04:00
|
|
|
func = f"read_u{bits}"
|
2023-01-05 17:01:07 -04:00
|
|
|
out.emit(
|
|
|
|
f"{typ}{ceffect.name} = {func}(&next_instr[{cache_offset}].cache);"
|
|
|
|
)
|
2022-12-02 23:57:30 -04:00
|
|
|
cache_offset += ceffect.size
|
|
|
|
assert cache_offset == self.cache_offset + cache_adjust
|
2022-11-17 21:06:07 -04:00
|
|
|
|
2022-12-17 00:45:55 -04: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 17:31:27 -04:00
|
|
|
assert dedent <= 0
|
|
|
|
extra = " " * -dedent
|
|
|
|
for line in self.block_text:
|
2023-01-24 18:39:13 -04:00
|
|
|
if m := re.match(r"(\s*)ERROR_IF\((.+), (\w+)\);\s*(?://.*)?$", line):
|
2022-11-17 21:06:07 -04:00
|
|
|
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 17:01:07 -04:00
|
|
|
if not self.register:
|
|
|
|
# Don't pop common input/output effects at the bottom!
|
|
|
|
# These aren't DECREF'ed so they can stay.
|
2023-01-17 19:59:19 -04:00
|
|
|
ieffs = list(self.input_effects)
|
|
|
|
oeffs = list(self.output_effects)
|
|
|
|
while ieffs and oeffs and ieffs[0] == oeffs[0]:
|
|
|
|
ieffs.pop(0)
|
|
|
|
oeffs.pop(0)
|
|
|
|
ninputs, symbolic = list_effect_size(ieffs)
|
|
|
|
if ninputs:
|
|
|
|
label = f"pop_{ninputs}_{label}"
|
2023-01-05 17:01:07 -04:00
|
|
|
else:
|
2023-01-17 19:59:19 -04:00
|
|
|
symbolic = ""
|
|
|
|
if symbolic:
|
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 17:31:27 -04:00
|
|
|
out.write_raw(
|
2023-01-17 19:59:19 -04:00
|
|
|
f"{extra}{space}if ({cond}) {{ STACK_SHRINK({symbolic}); goto {label}; }}\n"
|
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 17:31:27 -04:00
|
|
|
)
|
2022-11-17 21:06:07 -04: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 17:31:27 -04:00
|
|
|
out.write_raw(f"{extra}{space}if ({cond}) goto {label};\n")
|
2023-01-24 18:39:13 -04:00
|
|
|
elif m := re.match(r"(\s*)DECREF_INPUTS\(\);\s*(?://.*)?$", line):
|
2023-01-05 17:01:07 -04: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 21:06:07 -04: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 17:31:27 -04:00
|
|
|
out.write_raw(extra + line)
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
StackEffectMapping = list[tuple[StackEffect, StackEffect]]
|
2022-11-17 21:06:07 -04:00
|
|
|
|
|
|
|
|
2022-11-22 20:04:57 -04:00
|
|
|
@dataclasses.dataclass
|
2022-12-02 23:57:30 -04:00
|
|
|
class Component:
|
2022-11-22 20:04:57 -04: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 17:31:27 -04:00
|
|
|
input_mapping: StackEffectMapping
|
|
|
|
output_mapping: StackEffectMapping
|
2022-11-22 20:04:57 -04:00
|
|
|
|
2022-12-02 23:57:30 -04:00
|
|
|
def write_body(self, out: Formatter, cache_adjust: int) -> None:
|
|
|
|
with out.block(""):
|
2023-01-30 15:23:57 -04:00
|
|
|
input_names = {ieffect.name for _, ieffect in self.input_mapping}
|
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 17:31:27 -04:00
|
|
|
for var, ieffect in self.input_mapping:
|
|
|
|
out.declare(ieffect, var)
|
|
|
|
for _, oeffect in self.output_mapping:
|
2023-01-30 15:23:57 -04:00
|
|
|
if oeffect.name not in input_names:
|
|
|
|
out.declare(oeffect, None)
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
self.instr.write_body(out, dedent=-4, cache_adjust=cache_adjust)
|
2022-11-22 20:04:57 -04: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 17:31:27 -04:00
|
|
|
for var, oeffect in self.output_mapping:
|
|
|
|
out.assign(var, oeffect)
|
2022-11-22 20:04:57 -04:00
|
|
|
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
stack: list[StackEffect]
|
2022-11-22 20:04:57 -04:00
|
|
|
initial_sp: int
|
|
|
|
final_sp: int
|
2023-01-09 19:53:01 -04:00
|
|
|
instr_fmt: str
|
2022-11-22 20:04:57 -04:00
|
|
|
|
|
|
|
|
2022-12-02 23:57:30 -04:00
|
|
|
@dataclasses.dataclass
|
|
|
|
class SuperInstruction(SuperOrMacroInstruction):
|
|
|
|
"""A super-instruction."""
|
2022-11-22 20:04:57 -04:00
|
|
|
|
2022-12-02 23:57:30 -04: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 20:04:57 -04:00
|
|
|
|
|
|
|
|
2023-01-29 21:28:39 -04:00
|
|
|
AnyInstruction = Instruction | SuperInstruction | MacroInstruction
|
2023-01-09 19:53:01 -04:00
|
|
|
INSTR_FMT_PREFIX = "INSTR_FMT_"
|
|
|
|
|
|
|
|
|
2022-11-17 21:06:07 -04:00
|
|
|
class Analyzer:
|
|
|
|
"""Parse input, analyze it, and write to output."""
|
|
|
|
|
|
|
|
filename: str
|
2022-12-02 23:57:30 -04:00
|
|
|
output_filename: str
|
2022-11-17 21:06:07 -04:00
|
|
|
src: str
|
|
|
|
errors: int = 0
|
|
|
|
|
2022-12-02 23:57:30 -04: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 20:04:57 -04: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 23:57:30 -04:00
|
|
|
for token in context.owner.tokens[context.begin : context.end]:
|
2022-11-22 20:04:57 -04:00
|
|
|
lineno = token.line
|
|
|
|
if token.kind != "COMMENT":
|
|
|
|
break
|
|
|
|
print(f"{self.filename}:{lineno}: {msg}", file=sys.stderr)
|
|
|
|
self.errors += 1
|
|
|
|
|
2022-12-08 19:54:07 -04:00
|
|
|
everything: list[parser.InstDef | parser.Super | parser.Macro]
|
2022-11-22 20:04:57 -04:00
|
|
|
instrs: dict[str, Instruction] # Includes ops
|
2022-12-02 23:57:30 -04:00
|
|
|
supers: dict[str, parser.Super]
|
2022-11-22 20:04:57 -04:00
|
|
|
super_instrs: dict[str, SuperInstruction]
|
2022-12-02 23:57:30 -04:00
|
|
|
macros: dict[str, parser.Macro]
|
|
|
|
macro_instrs: dict[str, MacroInstruction]
|
2022-11-17 21:06:07 -04:00
|
|
|
families: dict[str, parser.Family]
|
|
|
|
|
|
|
|
def parse(self) -> None:
|
2022-12-02 23:57:30 -04:00
|
|
|
"""Parse the source text.
|
|
|
|
|
|
|
|
We only want the parser to see the stuff between the
|
|
|
|
begin and end markers.
|
|
|
|
"""
|
2022-11-17 21:06:07 -04: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-03 01:31:26 -03:00
|
|
|
else:
|
2022-11-22 20:04:57 -04:00
|
|
|
raise psr.make_syntax_error(
|
|
|
|
f"Couldn't find {BEGIN_MARKER!r} in {psr.filename}"
|
|
|
|
)
|
2022-12-02 23:57:30 -04:00
|
|
|
start = psr.getpos()
|
2022-11-17 21:06:07 -04:00
|
|
|
|
2022-12-02 23:57:30 -04: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 19:54:07 -04:00
|
|
|
self.everything = []
|
2022-11-17 21:06:07 -04:00
|
|
|
self.instrs = {}
|
|
|
|
self.supers = {}
|
2022-12-02 23:57:30 -04:00
|
|
|
self.macros = {}
|
2022-11-17 21:06:07 -04:00
|
|
|
self.families = {}
|
2023-01-29 21:28:39 -04:00
|
|
|
thing: parser.InstDef | parser.Super | parser.Macro | parser.Family | None
|
2022-12-02 23:57:30 -04:00
|
|
|
while thing := psr.definition():
|
|
|
|
match thing:
|
|
|
|
case parser.InstDef(name=name):
|
|
|
|
self.instrs[name] = Instruction(thing)
|
2022-12-08 19:54:07 -04:00
|
|
|
self.everything.append(thing)
|
2022-12-02 23:57:30 -04:00
|
|
|
case parser.Super(name):
|
|
|
|
self.supers[name] = thing
|
2022-12-08 19:54:07 -04:00
|
|
|
self.everything.append(thing)
|
2022-12-02 23:57:30 -04:00
|
|
|
case parser.Macro(name):
|
|
|
|
self.macros[name] = thing
|
2022-12-08 19:54:07 -04:00
|
|
|
self.everything.append(thing)
|
2022-12-02 23:57:30 -04: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 21:06:07 -04:00
|
|
|
|
|
|
|
print(
|
2022-12-02 23:57:30 -04:00
|
|
|
f"Read {len(self.instrs)} instructions/ops, "
|
|
|
|
f"{len(self.supers)} supers, {len(self.macros)} macros, "
|
2022-11-17 21:06:07 -04: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()
|
2023-01-05 17:01:07 -04:00
|
|
|
self.analyze_register_instrs()
|
2022-12-02 23:57:30 -04:00
|
|
|
self.analyze_supers_and_macros()
|
2023-01-30 15:23:57 -04:00
|
|
|
self.map_families()
|
|
|
|
self.check_families()
|
2022-11-17 21:06:07 -04: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 17:31:27 -04: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 21:06:07 -04:00
|
|
|
if target_instr := self.instrs.get(target):
|
|
|
|
target_instr.predicted = True
|
|
|
|
else:
|
2022-11-22 20:04:57 -04:00
|
|
|
self.error(
|
2022-11-17 21:06:07 -04:00
|
|
|
f"Unknown instruction {target!r} predicted in {instr.name!r}",
|
2022-12-02 23:57:30 -04:00
|
|
|
instr.inst, # TODO: Use better location
|
2022-11-17 21:06:07 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
def map_families(self) -> None:
|
2023-01-30 15:23:57 -04:00
|
|
|
"""Link instruction names back to their family, if they have one."""
|
2022-11-17 21:06:07 -04:00
|
|
|
for family in self.families.values():
|
|
|
|
for member in family.members:
|
|
|
|
if member_instr := self.instrs.get(member):
|
2023-01-30 15:23:57 -04:00
|
|
|
if member_instr.family not in (family, None):
|
|
|
|
self.error(
|
|
|
|
f"Instruction {member} is a member of multiple families "
|
|
|
|
f"({member_instr.family.name}, {family.name}).",
|
2023-01-30 21:27:51 -04:00
|
|
|
family,
|
2023-01-30 15:23:57 -04:00
|
|
|
)
|
|
|
|
else:
|
|
|
|
member_instr.family = family
|
|
|
|
elif member_macro := self.macro_instrs.get(member):
|
|
|
|
for part in member_macro.parts:
|
|
|
|
if isinstance(part, Component):
|
|
|
|
if part.instr.family not in (family, None):
|
|
|
|
self.error(
|
|
|
|
f"Component {part.instr.name} of macro {member} "
|
|
|
|
f"is a member of multiple families "
|
|
|
|
f"({part.instr.family.name}, {family.name}).",
|
2023-01-30 21:27:51 -04:00
|
|
|
family,
|
2023-01-30 15:23:57 -04:00
|
|
|
)
|
|
|
|
else:
|
|
|
|
part.instr.family = family
|
2022-11-17 21:06:07 -04:00
|
|
|
else:
|
2022-11-22 20:04:57 -04:00
|
|
|
self.error(
|
2022-11-17 21:06:07 -04:00
|
|
|
f"Unknown instruction {member!r} referenced in family {family.name!r}",
|
2022-11-22 20:04:57 -04:00
|
|
|
family,
|
2022-11-17 21:06:07 -04: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 20:04:57 -04:00
|
|
|
self.error(f"Family {family.name!r} has insufficient members", family)
|
2023-01-30 21:27:51 -04:00
|
|
|
members = [
|
|
|
|
member
|
|
|
|
for member in family.members
|
|
|
|
if member in self.instrs or member in self.macro_instrs
|
|
|
|
]
|
2022-11-17 21:06:07 -04:00
|
|
|
if members != family.members:
|
|
|
|
unknown = set(family.members) - set(members)
|
2022-12-02 23:57:30 -04:00
|
|
|
self.error(
|
|
|
|
f"Family {family.name!r} has unknown members: {unknown}", family
|
|
|
|
)
|
2022-11-17 21:06:07 -04:00
|
|
|
if len(members) < 2:
|
|
|
|
continue
|
2023-01-30 15:23:57 -04:00
|
|
|
expected_effects = self.effect_counts(members[0])
|
2022-11-17 21:06:07 -04:00
|
|
|
for member in members[1:]:
|
2023-01-30 15:23:57 -04:00
|
|
|
member_effects = self.effect_counts(member)
|
|
|
|
if member_effects != expected_effects:
|
2022-11-22 20:04:57 -04:00
|
|
|
self.error(
|
2022-11-17 21:06:07 -04:00
|
|
|
f"Family {family.name!r} has inconsistent "
|
2023-01-30 15:23:57 -04:00
|
|
|
f"(cache, input, output) effects:\n"
|
|
|
|
f" {family.members[0]} = {expected_effects}; "
|
|
|
|
f"{member} = {member_effects}",
|
2022-11-22 20:04:57 -04:00
|
|
|
family,
|
2022-11-17 21:06:07 -04:00
|
|
|
)
|
2022-11-22 20:04:57 -04:00
|
|
|
|
2023-01-30 15:23:57 -04:00
|
|
|
def effect_counts(self, name: str) -> tuple[int, int, int]:
|
|
|
|
if instr := self.instrs.get(name):
|
|
|
|
cache = instr.cache_offset
|
|
|
|
input = len(instr.input_effects)
|
|
|
|
output = len(instr.output_effects)
|
|
|
|
elif macro := self.macro_instrs.get(name):
|
|
|
|
cache, input, output = 0, 0, 0
|
|
|
|
for part in macro.parts:
|
|
|
|
if isinstance(part, Component):
|
|
|
|
cache += part.instr.cache_offset
|
|
|
|
# A component may pop what the previous component pushed,
|
|
|
|
# so we offset the input/output counts by that.
|
|
|
|
delta_i = len(part.instr.input_effects)
|
|
|
|
delta_o = len(part.instr.output_effects)
|
|
|
|
offset = min(delta_i, output)
|
|
|
|
input += delta_i - offset
|
|
|
|
output += delta_o - offset
|
|
|
|
else:
|
|
|
|
assert isinstance(part, parser.CacheEffect), part
|
|
|
|
cache += part.size
|
|
|
|
else:
|
|
|
|
assert False, f"Unknown instruction {name!r}"
|
|
|
|
return cache, input, output
|
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
def analyze_register_instrs(self) -> None:
|
|
|
|
for instr in self.instrs.values():
|
|
|
|
if instr.register:
|
|
|
|
instr.analyze_registers(self)
|
|
|
|
|
2022-12-02 23:57:30 -04:00
|
|
|
def analyze_supers_and_macros(self) -> None:
|
|
|
|
"""Analyze each super- and macro instruction."""
|
2022-11-22 20:04:57 -04:00
|
|
|
self.super_instrs = {}
|
2022-12-02 23:57:30 -04: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 19:53:01 -04: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 17:31:27 -04:00
|
|
|
for instr in components:
|
|
|
|
part, sp = self.analyze_instruction(instr, stack, sp)
|
|
|
|
parts.append(part)
|
2023-01-09 19:53:01 -04:00
|
|
|
format += instr.instr_fmt
|
2022-12-02 23:57:30 -04:00
|
|
|
final_sp = sp
|
2023-01-29 21:28:39 -04:00
|
|
|
return SuperInstruction(
|
|
|
|
super.name, stack, initial_sp, final_sp, format, super, parts
|
|
|
|
)
|
2022-12-02 23:57:30 -04: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 19:53:01 -04:00
|
|
|
format = "IB" # Macros don't support register instructions yet
|
|
|
|
cache = "C"
|
2022-12-02 23:57:30 -04:00
|
|
|
for component in components:
|
|
|
|
match component:
|
|
|
|
case parser.CacheEffect() as ceffect:
|
|
|
|
parts.append(ceffect)
|
2023-01-09 19:53:01 -04:00
|
|
|
for _ in range(ceffect.size):
|
|
|
|
format += cache
|
|
|
|
cache = "0"
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
part, sp = self.analyze_instruction(instr, stack, sp)
|
|
|
|
parts.append(part)
|
2023-01-09 19:53:01 -04:00
|
|
|
for ce in instr.cache_effects:
|
|
|
|
for _ in range(ce.size):
|
|
|
|
format += cache
|
|
|
|
cache = "0"
|
2022-12-02 23:57:30 -04:00
|
|
|
case _:
|
|
|
|
typing.assert_never(component)
|
|
|
|
final_sp = sp
|
2023-01-29 21:28:39 -04:00
|
|
|
return MacroInstruction(
|
|
|
|
macro.name, stack, initial_sp, final_sp, format, macro, parts
|
|
|
|
)
|
2022-12-02 23:57:30 -04: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 17:31:27 -04: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 23:57:30 -04: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 21:06:07 -04:00
|
|
|
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
) -> tuple[list[StackEffect], int]:
|
2022-12-02 23:57:30 -04:00
|
|
|
"""Analyze a super-instruction or macro.
|
|
|
|
|
2022-12-27 21:11:03 -04:00
|
|
|
Ignore cache effects.
|
2022-12-02 23:57:30 -04: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:
|
2023-01-29 21:28:39 -04:00
|
|
|
if any(
|
|
|
|
eff.size for eff in instr.input_effects + instr.output_effects
|
|
|
|
):
|
2023-01-17 19:59:19 -04:00
|
|
|
# TODO: Eventually this will be needed, at least for macros.
|
|
|
|
self.error(
|
|
|
|
f"Instruction {instr.name!r} has variable-sized stack effect, "
|
|
|
|
"which are not supported in super- or macro instructions",
|
|
|
|
instr.inst, # TODO: Pass name+location of super/macro
|
|
|
|
)
|
2022-12-02 23:57:30 -04:00
|
|
|
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 17:31:27 -04:00
|
|
|
# TODO: Reverse the numbering.
|
|
|
|
stack = [
|
|
|
|
StackEffect(f"_tmp_{i+1}", "") for i in reversed(range(highest - lowest))
|
|
|
|
]
|
2022-12-02 23:57:30 -04:00
|
|
|
return stack, -lowest
|
|
|
|
|
2023-01-25 16:41:03 -04:00
|
|
|
def get_stack_effect_info(
|
|
|
|
self, thing: parser.InstDef | parser.Super | parser.Macro
|
2023-01-29 21:28:39 -04:00
|
|
|
) -> tuple[AnyInstruction | None, str, str]:
|
|
|
|
def effect_str(effects: list[StackEffect]) -> str:
|
|
|
|
if getattr(thing, "kind", None) == "legacy":
|
2023-01-25 16:41:03 -04:00
|
|
|
return str(-1)
|
2023-01-29 21:28:39 -04:00
|
|
|
n_effect, sym_effect = list_effect_size(effects)
|
2023-01-25 16:41:03 -04:00
|
|
|
if sym_effect:
|
|
|
|
return f"{sym_effect} + {n_effect}" if n_effect else sym_effect
|
|
|
|
return str(n_effect)
|
|
|
|
|
2023-01-29 21:28:39 -04:00
|
|
|
instr: AnyInstruction | None
|
2023-01-25 16:41:03 -04:00
|
|
|
match thing:
|
|
|
|
case parser.InstDef():
|
|
|
|
if thing.kind != "op":
|
|
|
|
instr = self.instrs[thing.name]
|
|
|
|
popped = effect_str(instr.input_effects)
|
|
|
|
pushed = effect_str(instr.output_effects)
|
2023-01-26 13:15:05 -04:00
|
|
|
else:
|
|
|
|
instr = None
|
2023-01-29 21:28:39 -04:00
|
|
|
popped = ""
|
|
|
|
pushed = ""
|
2023-01-25 16:41:03 -04:00
|
|
|
case parser.Super():
|
|
|
|
instr = self.super_instrs[thing.name]
|
2023-01-29 21:28:39 -04:00
|
|
|
popped = "+".join(
|
|
|
|
effect_str(comp.instr.input_effects) for comp in instr.parts
|
|
|
|
)
|
|
|
|
pushed = "+".join(
|
|
|
|
effect_str(comp.instr.output_effects) for comp in instr.parts
|
|
|
|
)
|
2023-01-25 16:41:03 -04:00
|
|
|
case parser.Macro():
|
|
|
|
instr = self.macro_instrs[thing.name]
|
|
|
|
parts = [comp for comp in instr.parts if isinstance(comp, Component)]
|
2023-01-29 21:28:39 -04:00
|
|
|
popped = "+".join(
|
|
|
|
effect_str(comp.instr.input_effects) for comp in parts
|
|
|
|
)
|
|
|
|
pushed = "+".join(
|
|
|
|
effect_str(comp.instr.output_effects) for comp in parts
|
|
|
|
)
|
2023-01-25 16:41:03 -04:00
|
|
|
case _:
|
|
|
|
typing.assert_never(thing)
|
|
|
|
return instr, popped, pushed
|
|
|
|
|
|
|
|
def write_stack_effect_functions(self) -> None:
|
2023-01-29 21:28:39 -04:00
|
|
|
popped_data: list[tuple[AnyInstruction, str]] = []
|
|
|
|
pushed_data: list[tuple[AnyInstruction, str]] = []
|
2023-01-25 16:41:03 -04:00
|
|
|
for thing in self.everything:
|
|
|
|
instr, popped, pushed = self.get_stack_effect_info(thing)
|
2023-01-26 13:15:05 -04:00
|
|
|
if instr is not None:
|
2023-01-29 21:28:39 -04:00
|
|
|
popped_data.append((instr, popped))
|
|
|
|
pushed_data.append((instr, pushed))
|
2023-01-25 16:41:03 -04:00
|
|
|
|
2023-01-30 21:27:51 -04:00
|
|
|
def write_function(
|
|
|
|
direction: str, data: list[tuple[AnyInstruction, str]]
|
|
|
|
) -> None:
|
2023-01-29 21:28:39 -04:00
|
|
|
self.out.emit("\n#ifndef NDEBUG")
|
|
|
|
self.out.emit("static int")
|
2023-01-25 16:41:03 -04:00
|
|
|
self.out.emit(f"_PyOpcode_num_{direction}(int opcode, int oparg) {{")
|
2023-01-29 21:28:39 -04:00
|
|
|
self.out.emit(" switch(opcode) {")
|
2023-01-25 16:41:03 -04:00
|
|
|
for instr, effect in data:
|
|
|
|
self.out.emit(f" case {instr.name}:")
|
|
|
|
self.out.emit(f" return {effect};")
|
|
|
|
self.out.emit(" default:")
|
|
|
|
self.out.emit(" Py_UNREACHABLE();")
|
|
|
|
self.out.emit(" }")
|
|
|
|
self.out.emit("}")
|
2023-01-29 21:28:39 -04:00
|
|
|
self.out.emit("#endif")
|
2023-01-25 16:41:03 -04:00
|
|
|
|
2023-01-29 21:28:39 -04:00
|
|
|
write_function("popped", popped_data)
|
|
|
|
write_function("pushed", pushed_data)
|
2023-01-25 16:41:03 -04:00
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
def write_metadata(self) -> None:
|
|
|
|
"""Write instruction metadata to output file."""
|
2023-01-09 19:53:01 -04: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 17:01:07 -04:00
|
|
|
with open(self.output_filename, "w") as f:
|
|
|
|
# Write provenance header
|
2023-01-17 19:59:19 -04:00
|
|
|
f.write(f"// This file is generated by {THIS} --metadata\n")
|
|
|
|
f.write(f"// from {os.path.relpath(self.filename, ROOT)}\n")
|
2023-01-05 17:01:07 -04:00
|
|
|
f.write(f"// Do not edit!\n")
|
|
|
|
|
|
|
|
# Create formatter; the rest of the code uses this
|
|
|
|
self.out = Formatter(f, 0)
|
|
|
|
|
2023-01-25 16:41:03 -04:00
|
|
|
self.write_stack_effect_functions()
|
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
# Write variable definition
|
|
|
|
self.out.emit("enum Direction { DIR_NONE, DIR_READ, DIR_WRITE };")
|
2023-01-09 19:53:01 -04:00
|
|
|
self.out.emit(f"enum InstructionFormat {{ {', '.join(format_enums)} }};")
|
2023-01-25 16:41:03 -04:00
|
|
|
self.out.emit("struct opcode_metadata {")
|
2023-01-05 17:01:07 -04:00
|
|
|
with self.out.indent():
|
|
|
|
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 19:53:01 -04:00
|
|
|
self.out.emit("enum InstructionFormat instr_format;")
|
2023-01-05 17:01:07 -04: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":
|
|
|
|
assert not instr.register
|
|
|
|
else:
|
|
|
|
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-29 21:28:39 -04:00
|
|
|
f" [{instr.name}] = {{ {dir_op1}, {dir_op2}, {dir_op3}, true, {INSTR_FMT_PREFIX}{instr.instr_fmt} }},"
|
2023-01-05 17:01:07 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
def write_metadata_for_super(self, sup: SuperInstruction) -> None:
|
|
|
|
"""Write metadata for a super-instruction."""
|
|
|
|
dir_op1 = dir_op2 = dir_op3 = "DIR_NONE"
|
|
|
|
self.out.emit(
|
2023-01-29 21:28:39 -04:00
|
|
|
f" [{sup.name}] = {{ {dir_op1}, {dir_op2}, {dir_op3}, true, {INSTR_FMT_PREFIX}{sup.instr_fmt} }},"
|
2023-01-05 17:01:07 -04:00
|
|
|
)
|
|
|
|
|
|
|
|
def write_metadata_for_macro(self, mac: MacroInstruction) -> None:
|
|
|
|
"""Write metadata for a macro-instruction."""
|
|
|
|
dir_op1 = dir_op2 = dir_op3 = "DIR_NONE"
|
|
|
|
self.out.emit(
|
2023-01-29 21:28:39 -04:00
|
|
|
f" [{mac.name}] = {{ {dir_op1}, {dir_op2}, {dir_op3}, true, {INSTR_FMT_PREFIX}{mac.instr_fmt} }},"
|
2023-01-05 17:01:07 -04:00
|
|
|
)
|
|
|
|
|
2022-12-02 23:57:30 -04:00
|
|
|
def write_instructions(self) -> None:
|
2022-11-17 21:06:07 -04:00
|
|
|
"""Write instructions to output file."""
|
2022-12-02 23:57:30 -04:00
|
|
|
with open(self.output_filename, "w") as f:
|
2022-11-17 21:06:07 -04:00
|
|
|
# Write provenance header
|
2023-01-17 19:59:19 -04:00
|
|
|
f.write(f"// This file is generated by {THIS}\n")
|
|
|
|
f.write(f"// from {os.path.relpath(self.filename, ROOT)}\n")
|
2022-11-17 21:06:07 -04:00
|
|
|
f.write(f"// Do not edit!\n")
|
|
|
|
|
2023-01-05 17:01:07 -04:00
|
|
|
# Create formatter; the rest of the code uses this
|
2022-12-02 23:57:30 -04:00
|
|
|
self.out = Formatter(f, 8)
|
|
|
|
|
2022-12-08 19:54:07 -04:00
|
|
|
# Write and count instructions of all kinds
|
2022-11-22 20:04:57 -04:00
|
|
|
n_instrs = 0
|
|
|
|
n_supers = 0
|
2022-12-02 23:57:30 -04:00
|
|
|
n_macros = 0
|
2022-12-08 19:54:07 -04:00
|
|
|
for thing in self.everything:
|
|
|
|
match thing:
|
|
|
|
case parser.InstDef():
|
2023-01-05 17:01:07 -04:00
|
|
|
if thing.kind != "op":
|
2022-12-08 19:54:07 -04: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 20:04:57 -04:00
|
|
|
|
2022-12-02 23:57:30 -04: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 20:04:57 -04:00
|
|
|
|
2022-12-08 19:54:07 -04: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 23:57:30 -04: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 17:01:07 -04:00
|
|
|
if first:
|
|
|
|
pass
|
|
|
|
# self.out.emit("JUMPBY(OPSIZE(opcode) - 1);")
|
|
|
|
else:
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
self.out.emit("JUMPBY(1);")
|
2023-01-05 17:01:07 -04:00
|
|
|
# self.out.emit("JUMPBY(OPSIZE(opcode));")
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
self.out.emit(f"JUMPBY({comp.instr.cache_offset});")
|
2022-12-02 23:57:30 -04:00
|
|
|
|
|
|
|
def write_macro(self, mac: MacroInstruction) -> None:
|
|
|
|
"""Write code for a macro instruction."""
|
2023-01-30 21:27:51 -04:00
|
|
|
last_instr: Instruction | None = None
|
2022-12-02 23:57:30 -04:00
|
|
|
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:
|
2023-01-30 21:27:51 -04:00
|
|
|
last_instr = comp.instr
|
2022-12-02 23:57:30 -04:00
|
|
|
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 17:31:27 -04:00
|
|
|
self.out.emit(f"JUMPBY({cache_adjust});")
|
2022-12-02 23:57:30 -04:00
|
|
|
|
2023-01-30 21:27:51 -04:00
|
|
|
if (
|
|
|
|
last_instr
|
|
|
|
and (family := last_instr.family)
|
|
|
|
and mac.name == family.members[0]
|
|
|
|
and (cache_size := family.size)
|
|
|
|
):
|
|
|
|
self.out.emit(
|
|
|
|
f"static_assert({cache_size} == "
|
|
|
|
f'{cache_adjust}, "incorrect cache size");'
|
|
|
|
)
|
|
|
|
|
2022-12-02 23:57:30 -04: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 17:31:27 -04: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 23:57:30 -04: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 17:31:27 -04:00
|
|
|
for i, var in reversed(list(enumerate(up.stack))):
|
|
|
|
src = None
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
src = StackEffect(f"PEEK({up.initial_sp - i})", "")
|
|
|
|
self.out.declare(var, src)
|
2022-12-02 23:57:30 -04:00
|
|
|
|
|
|
|
yield
|
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
# TODO: Use slices of up.stack instead of numeric values
|
|
|
|
self.out.stack_adjust(up.final_sp - up.initial_sp, [], [])
|
|
|
|
|
2022-12-02 23:57:30 -04: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 17:31:27 -04:00
|
|
|
dst = StackEffect(f"PEEK({i})", "")
|
|
|
|
self.out.assign(dst, var)
|
2022-12-02 23:57:30 -04:00
|
|
|
|
|
|
|
self.out.emit(f"DISPATCH();")
|
2022-11-22 20:04:57 -04:00
|
|
|
|
2022-11-03 01:31:26 -03: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 17:31:27 -04: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] = []
|
2023-01-29 21:28:39 -04:00
|
|
|
while blocklines and (
|
|
|
|
m := re.match(r"^\s*PREDICT\((\w+)\);\s*(?://.*)?$", blocklines[-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 17:31:27 -04:00
|
|
|
predictions.insert(0, m.group(1))
|
|
|
|
blocklines.pop()
|
|
|
|
|
|
|
|
return blocklines, predictions
|
|
|
|
|
|
|
|
|
|
|
|
def always_exits(lines: list[str]) -> bool:
|
2022-11-17 21:06:07 -04:00
|
|
|
"""Determine whether a block always ends in a return/goto/etc."""
|
2022-11-03 01:31:26 -03: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 17:31:27 -04:00
|
|
|
line = lines[-1].rstrip()
|
2022-11-03 01:31:26 -03:00
|
|
|
# Indent must match exactly (TODO: Do something better)
|
2022-11-17 21:06:07 -04:00
|
|
|
if line[:12] != " " * 12:
|
2022-11-03 01:31:26 -03:00
|
|
|
return False
|
|
|
|
line = line[12:]
|
2022-11-17 21:06:07 -04:00
|
|
|
return line.startswith(
|
2023-01-29 21:28:39 -04:00
|
|
|
(
|
|
|
|
"goto ",
|
|
|
|
"return ",
|
|
|
|
"DISPATCH",
|
|
|
|
"GO_TO_",
|
|
|
|
"Py_UNREACHABLE()",
|
|
|
|
"ERROR_IF(true, ",
|
|
|
|
)
|
2022-11-17 21:06:07 -04:00
|
|
|
)
|
2022-11-15 23:59:19 -04:00
|
|
|
|
2022-11-03 01:31:26 -03:00
|
|
|
|
2023-01-17 19:59:19 -04:00
|
|
|
def variable_used(node: parser.Node, name: str) -> bool:
|
|
|
|
"""Determine whether a variable with a given name is used in a node."""
|
2023-01-29 21:28:39 -04:00
|
|
|
return any(
|
|
|
|
token.kind == "IDENTIFIER" and token.text == name for token in node.tokens
|
|
|
|
)
|
2023-01-13 21:06:45 -04:00
|
|
|
|
|
|
|
|
2022-11-03 01:31:26 -03:00
|
|
|
def main():
|
2022-11-17 21:06:07 -04: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 17:01:07 -04:00
|
|
|
if args.metadata:
|
|
|
|
if args.output == DEFAULT_OUTPUT:
|
|
|
|
args.output = DEFAULT_METADATA_OUTPUT
|
2022-12-02 23:57:30 -04:00
|
|
|
a = Analyzer(args.input, args.output) # Raises OSError if input unreadable
|
2022-11-17 21:06:07 -04:00
|
|
|
a.parse() # Raises SyntaxError on failure
|
2022-12-02 23:57:30 -04:00
|
|
|
a.analyze() # Prints messages and sets a.errors on failure
|
2022-11-17 21:06:07 -04:00
|
|
|
if a.errors:
|
|
|
|
sys.exit(f"Found {a.errors} errors")
|
2023-01-05 17:01:07 -04:00
|
|
|
if args.metadata:
|
|
|
|
a.write_metadata()
|
|
|
|
else:
|
|
|
|
a.write_instructions() # Raises OSError if output can't be written
|
2022-11-03 01:31:26 -03:00
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
|
|
|
main()
|