Skip to content

GH-131498: Another refactoring of the code generator #131827

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markshannon merged 18 commits into from
Mar 31, 2025
Merged

GH-131498: Another refactoring of the code generator #131827

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
45199ae
Remove redundant attribute
markshannon Mar 24, 2025
d786146
Rename 'defined' attribute to 'in_local' to more accurately reflect h…
markshannon Mar 24, 2025
2b21bf9
Remove unused function
markshannon Mar 24, 2025
66f5826
Make death of variables explicit even for array variables.
markshannon Mar 24, 2025
5d6a9f8
Remove used 'peeks' attribute
markshannon Mar 24, 2025
6e2a189
Convert in_memory from boolean to stack offset
markshannon Mar 24, 2025
417c96d
Don't apply liveness analyis to optimizer generated code
markshannon Mar 25, 2025
05a4daa
Fix RETURN_VALUE in optimizer
markshannon Mar 25, 2025
b8c3a9e
Fix up type annotations
markshannon Mar 25, 2025
d81c7de
Fixup NULLing out array items during DECREF_INPUTS
markshannon Mar 26, 2025
af5f616
Cleanup errors
markshannon Mar 26, 2025
9238a67
Update test output to reflect fix
markshannon Mar 26, 2025
f80764f
Cases gen refactoring.
markshannon Mar 26, 2025
fbad220
Merge branch 'main' into code-gen-refactor-again
markshannon Mar 27, 2025
ba3979d
Add 'out' parameter to stack.pop
markshannon Mar 27, 2025
e38eab4
Don't declare unused variables and update test
markshannon Mar 30, 2025
e95d33b
Remove unreachable code
markshannon Mar 31, 2025
b7eb0bd
Handle negative numbers smaller than -9
markshannon Mar 31, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix up type annotations
  • Loading branch information
@markshannon
markshannon committed Mar 25, 2025
commit b8c3a9ebe9ad89c5d2ccc98ea58ae7ddb2262f8e
12 changes: 6 additions & 6 deletions Tools/cases_generator/stack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ def kill(self) -> None:
self.in_local = False
self.memory_offset = None

def in_memory(self):
def in_memory(self) -> bool:
return self.memory_offset is not None or self.is_array()

def is_dead(self) -> bool:
Expand Down Expand Up @@ -220,7 +220,7 @@ def __init__(self, extract_bits: bool=True, cast_type: str = "uintptr_t") -> Non
self.extract_bits = extract_bits
self.cast_type = cast_type

def drop(self, var: StackItem, check_liveness: bool):
def drop(self, var: StackItem, check_liveness: bool) -> None:
self.top_offset.pop(var)
if self.variables:
popped = self.variables.pop()
Expand Down Expand Up @@ -376,7 +376,7 @@ def merge(self, other: "Stack", out: CWriter) -> None:
for self_var, other_var in zip(self.variables, other.variables):
if self_var.memory_offset is not None:
if self_var.memory_offset != other_var.memory_offset:
raise StackError(f"Mismatched stack depths for {self_var.name}: {self_var.memory_offset.to_c()} and {other_var.memory_offset.to_c()}")
raise StackError(f"Mismatched stack depths for {self_var.name}: {self_var.memory_offset} and {other_var.memory_offset}")


def stacks(inst: Instruction | PseudoInstruction) -> Iterator[StackEffect]:
Expand Down Expand Up @@ -518,7 +518,7 @@ def reload(self, out: CWriter) -> None:
out.emit_reload()

@staticmethod
def for_uop(stack: Stack, uop: Uop, check_liveness=True) -> tuple[list[str], "Storage"]:
def for_uop(stack: Stack, uop: Uop, check_liveness: bool = True) -> tuple[list[str], "Storage"]:
code_list: list[str] = []
inputs: list[Local] = []
peeks: list[Local] = []
Expand Down Expand Up @@ -687,7 +687,7 @@ def close_variable(var: Local, overwrite: str) -> None:
self.stack.drop(output.item, self.check_liveness)
self.inputs = []
return
if var_size(lowest) != var_size(output):
if var_size(lowest.item) != var_size(output.item):
raise StackError("Cannot call DECREF_INPUTS with live output not matching first input size")
lowest.in_local = True
close_variable(lowest, output.name)
Expand All @@ -702,7 +702,7 @@ def close_variable(var: Local, overwrite: str) -> None:
self.stack.pop(self.inputs[0].item)
output_in_place = self.outputs and output is self.outputs[0] and lowest.memory_offset is not None
if output_in_place:
output.memory_offset = lowest.memory_offset.copy()
output.memory_offset = lowest.memory_offset.copy() # type: ignore[union-attr]
else:
self.stack.flush(out)
if output is not None:
Expand Down