mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Refactor code generators a bit (GH-128920)

Browse source 
Refactor code generators a bit to avoid passing stack property around all over the place
This commit is contained in:
Mark Shannon 2025-01-17 16:59:30 +00:00 • committed by GitHub
parent d66c08aa75
commit b5558cd63c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Tools/cases_generator/optimizer_generator.py
View file

@ -126,7 +126,7 @@ def write_uop(
try:
out.start_line()
if override:
code_list, storage = Storage.for_uop(stack, prototype, extract_bits=False)
code_list, storage = Storage.for_uop(stack, prototype)
for code in code_list:
out.emit(code)
if debug:
@ -151,11 +151,11 @@ def write_uop(
var.defined = False
storage = emitter.emit_tokens(override, storage, None)
out.start_line()
storage.flush(out, cast_type="_Py_UopsSymbol *", extract_bits=False)
storage.flush(out, cast_type="_Py_UopsSymbol *")
else:
emit_default(out, uop, stack)
out.start_line()
stack.flush(out, cast_type="_Py_UopsSymbol *", extract_bits=False)
stack.flush(out, cast_type="_Py_UopsSymbol *")
except StackError as ex:
raise analysis_error(ex.args[0], prototype.body[0]) # from None
@ -198,7 +198,7 @@ def generate_abstract_interpreter(
declare_variables(override, out, skip_inputs=False)
else:
declare_variables(uop, out, skip_inputs=True)
stack = Stack()
stack = Stack(False)
write_uop(override, uop, out, stack, debug, skip_inputs=(override is None))
out.start_line()
out.emit("break;\n")

21
Tools/cases_generator/stack.py
View file

@ -224,13 +224,14 @@ def array_or_scalar(var: StackItem | Local) -> str:
return "array" if var.is_array() else "scalar"
class Stack:
def __init__(self) -> None:
def __init__(self, extract_bits: bool=True) -> None:
self.top_offset = StackOffset.empty()
self.base_offset = StackOffset.empty()
self.variables: list[Local] = []
self.defined: set[str] = set()
self.extract_bits = extract_bits
def pop(self, var: StackItem, extract_bits: bool = True) -> tuple[str, Local]:
def pop(self, var: StackItem) -> tuple[str, Local]:
self.top_offset.pop(var)
indirect = "&" if var.is_array() else ""
if self.variables:
@ -272,7 +273,7 @@ class Stack:
return "", Local.unused(var)
self.defined.add(var.name)
cast = f"({var.type})" if (not indirect and var.type) else ""
bits = ".bits" if cast and extract_bits else ""
bits = ".bits" if cast and self.extract_bits else ""
assign = f"{var.name} = {cast}{indirect}stack_pointer[{self.base_offset.to_c()}]{bits};"
if var.condition:
if var.condition == "1":
@ -315,7 +316,7 @@ class Stack:
out.emit("assert(WITHIN_STACK_BOUNDS());\n")
def flush(
self, out: CWriter, cast_type: str = "uintptr_t", extract_bits: bool = True
self, out: CWriter, cast_type: str = "uintptr_t"
) -> None:
out.start_line()
var_offset = self.base_offset.copy()
@ -324,7 +325,7 @@ class Stack:
var.defined and
not var.in_memory
):
Stack._do_emit(out, var.item, var_offset, cast_type, extract_bits)
Stack._do_emit(out, var.item, var_offset, cast_type, self.extract_bits)
var.in_memory = True
var_offset.push(var.item)
number = self.top_offset.to_c()
@ -346,7 +347,7 @@ class Stack:
)
def copy(self) -> "Stack":
other = Stack()
other = Stack(self.extract_bits)
other.top_offset = self.top_offset.copy()
other.base_offset = self.base_offset.copy()
other.variables = [var.copy() for var in self.variables]
@ -507,10 +508,10 @@ class Storage:
return True
return False
def flush(self, out: CWriter, cast_type: str = "uintptr_t", extract_bits: bool = True) -> None:
def flush(self, out: CWriter, cast_type: str = "uintptr_t") -> None:
self.clear_dead_inputs()
self._push_defined_outputs()
self.stack.flush(out, cast_type, extract_bits)
self.stack.flush(out, cast_type)
def save(self, out: CWriter) -> None:
assert self.spilled >= 0
@ -530,12 +531,12 @@ class Storage:
out.emit("stack_pointer = _PyFrame_GetStackPointer(frame);\n")
@staticmethod
def for_uop(stack: Stack, uop: Uop, extract_bits: bool = True) -> tuple[list[str], "Storage"]:
def for_uop(stack: Stack, uop: Uop) -> tuple[list[str], "Storage"]:
code_list: list[str] = []
inputs: list[Local] = []
peeks: list[Local] = []
for input in reversed(uop.stack.inputs):
code, local = stack.pop(input, extract_bits)
code, local = stack.pop(input)
code_list.append(code)
if input.peek:
peeks.append(local)