Skip to content

gh-105481: refactor instr flag related code into a new InstructionFlags class #105950

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
iritkatriel merged 5 commits into from
Jun 21, 2023
Merged

gh-105481: refactor instr flag related code into a new InstructionFlags class #105950

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb43ee8
gh-105481: refactor instr flag related code into a new InstructionFla…
iritkatriel Jun 20, 2023
a08ac66
code review comments
iritkatriel Jun 21, 2023
8fcd65f
make InstructionFlags a dataclass
iritkatriel Jun 21, 2023
d383eaa
remove __hash__ and __eq__
iritkatriel Jun 21, 2023
f34174d
hash the bitmap instead of the InstructionFlags object
iritkatriel Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
code review comments
  • Loading branch information
@iritkatriel
iritkatriel committed Jun 21, 2023
commit a08ac664c227730f1512b2397983dbb51b97cf21
48 changes: 27 additions & 21 deletions Tools/cases_generator/generate_cases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,38 +238,40 @@ def cast(self, dst: StackEffect, src: StackEffect) -> str:
class InstructionFlags:
Comment thread
iritkatriel marked this conversation as resolved.
"""Construct and manipulate instruction flags"""

INSTRUCTION_FLAGS = ['HAS_ARG', 'HAS_CONST', 'HAS_NAME', 'HAS_JUMP']
INSTRUCTION_FLAGS = ["HAS_ARG", "HAS_CONST", "HAS_NAME", "HAS_JUMP"]
INSTR_FLAG_SUFFIX = "_FLAG"

def __init__(self, has_arg: bool, has_const: bool, has_name: bool,
has_jump: bool):
def __init__(
self, has_arg: bool, has_const: bool, has_name: bool, has_jump: bool
):

self.data = {
'HAS_ARG': has_arg,
'HAS_CONST': has_const,
'HAS_NAME': has_name,
'HAS_JUMP': has_jump,
"HAS_ARG": has_arg,
"HAS_CONST": has_const,
"HAS_NAME": has_name,
"HAS_JUMP": has_jump,
}
assert set(self.data.keys()) == set(self.INSTRUCTION_FLAGS)

@staticmethod
def fromInstruction(instr: "AnyInstruction"):
return InstructionFlags(
has_arg = variable_used(instr, "oparg"),
has_const = variable_used(instr, "FRAME_CO_CONSTS"),
has_name = variable_used(instr, "FRAME_CO_NAMES"),
has_jump = variable_used(instr, "JUMPBY"),
has_arg=variable_used(instr, "oparg"),
has_const=variable_used(instr, "FRAME_CO_CONSTS"),
has_name=variable_used(instr, "FRAME_CO_NAMES"),
has_jump=variable_used(instr, "JUMPBY"),
)

@staticmethod
def newEmpty():
return InstructionFlags(False, False, False, False)

def __str__(self) -> str:
flags_strs = [f"{name}{self.INSTR_FLAG_SUFFIX}" for i, name in
enumerate(self.INSTRUCTION_FLAGS) if self.is_set(name)]
if (len(flags_strs)) == 4: breakpoint()
return "0" if not flags_strs else ' | '.join(flags_strs)
def names(self) -> list[str]:
return [
f"{name}{self.INSTR_FLAG_SUFFIX}"
for name in self.INSTRUCTION_FLAGS
if self.is_set(name)
]

def __eq__(self, other: "InstructionFlags") -> False:
return self.bitmap() == other.bitmap()
Expand All @@ -291,14 +293,14 @@ def is_set(self, name: str) -> bool:
return self.data[name]

@classmethod
def emit_macros(cls, formatter: Formatter):
def emit_macros(cls, out: Formatter):
for i, flag in enumerate(cls.INSTRUCTION_FLAGS):
flag_name = f"{flag}{cls.INSTR_FLAG_SUFFIX}"
formatter.emit(f"#define {flag_name} ({1 << i})");
out.emit(f"#define {flag_name} ({1 << i})");

for flag in cls.INSTRUCTION_FLAGS:
flag_name = f"{flag}{cls.INSTR_FLAG_SUFFIX}"
formatter.emit(
out.emit(
f"#define OPCODE_{flag}(OP) "
f"(_PyOpcode_opcode_metadata[(OP)].flags & ({flag_name}))")

Expand Down Expand Up @@ -1206,9 +1208,13 @@ def write_pseudo_instrs(self) -> None:
self.out.emit(f" ((OP) == {op}) || \\")
self.out.emit(f" 0")

def emit_metadata_entry(self, name: str, fmt: str, flags: InstructionFlags) -> None:
def emit_metadata_entry(
self, name: str, fmt: str, flags: InstructionFlags
) -> None:
if not (names := flags.names()):
names.append("0")
self.out.emit(
f" [{name}] = {{ true, {INSTR_FMT_PREFIX}{fmt}, {flags} }},"
f" [{name}] = {{ true, {INSTR_FMT_PREFIX}{fmt}, {' | '.join(names)} }},"
)

def write_metadata_for_inst(self, instr: Instruction) -> None:
Expand Down